diff --git a/ncurses-6.1-20190615.patch b/ncurses-6.1-20190615.patch deleted file mode 100644 index d79adfb..0000000 --- a/ncurses-6.1-20190615.patch +++ /dev/null @@ -1,1437 +0,0 @@ -# ncurses 6.1 - patch 20190615 - Thomas E. Dickey -# -# ------------------------------------------------------------------------------ -# -# Ncurses 6.1 is at -# ftp.gnu.org:/pub/gnu -# -# Patches for ncurses 6.1 can be found at -# ftp://ftp.invisible-island.net/ncurses/6.1 -# http://invisible-mirror.net/archives/ncurses/6.1 -# -# ------------------------------------------------------------------------------ -# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190615.patch.gz -# patch by Thomas E. Dickey -# created Sun Jun 16 00:13:35 UTC 2019 -# ------------------------------------------------------------------------------ -# NEWS | 6 -# VERSION | 2 -# dist.mk | 4 -# doc/html/ada/funcs/T.htm | 2 -# doc/html/man/adacurses6-config.1.html | 2 -# doc/html/man/captoinfo.1m.html | 2 -# doc/html/man/clear.1.html | 2 -# doc/html/man/curs_variables.3x.html | 12 -# doc/html/man/form.3x.html | 2 -# doc/html/man/infocmp.1m.html | 2 -# doc/html/man/infotocap.1m.html | 2 -# doc/html/man/menu.3x.html | 2 -# doc/html/man/menu_spacing.3x.html | 6 -# doc/html/man/ncurses.3x.html | 2 -# doc/html/man/ncurses6-config.1.html | 2 -# doc/html/man/panel.3x.html | 2 -# doc/html/man/tabs.1.html | 55 ++- -# doc/html/man/terminfo.5.html | 503 +++++++++++++++++--------------- -# doc/html/man/tic.1m.html | 4 -# doc/html/man/toe.1m.html | 2 -# doc/html/man/tput.1.html | 2 -# doc/html/man/tset.1.html | 2 -# doc/html/man/user_caps.5.html | 4 -# man/tabs.1 | 49 ++- -# package/debian-mingw/changelog | 4 -# package/debian-mingw64/changelog | 4 -# package/debian/changelog | 4 -# package/mingw-ncurses.nsi | 4 -# package/mingw-ncurses.spec | 2 -# package/ncurses.spec | 2 -# package/ncursest.spec | 2 -# 31 files changed, 407 insertions(+), 288 deletions(-) -# ------------------------------------------------------------------------------ -Index: NEWS -Prereq: 1.3329 ---- ncurses-6.1-20190609+/NEWS 2019-06-09 20:07:36.000000000 +0000 -+++ ncurses-6.1-20190615/NEWS 2019-06-15 23:39:53.000000000 +0000 -@@ -25,7 +25,7 @@ - -- sale, use or other dealings in this Software without prior written -- - -- authorization. -- - ------------------------------------------------------------------------------- ---- $Id: NEWS,v 1.3329 2019/06/09 20:07:36 tom Exp $ -+-- $Id: NEWS,v 1.3332 2019/06/15 23:39:53 tom Exp $ - ------------------------------------------------------------------------------- - - This is a log of changes that ncurses has gone through since Zeyd started -@@ -45,6 +45,10 @@ - Changes through 1.9.9e did not credit all contributions; - it is not possible to add this information. - -+20190615 -+ + expand the portability section of the man/tabs.1 manual page. -+ + regenerate HTML manpages. -+ - 20190609 - + add mintty, mintty-direct (adapted from patch by Thomas Wolff). - Some of the suggested user-defined capabilities are commented-out, -Index: VERSION ---- ncurses-6.1-20190609+/VERSION 2019-06-09 20:06:01.000000000 +0000 -+++ ncurses-6.1-20190615/VERSION 2019-06-15 12:46:35.000000000 +0000 -@@ -1 +1 @@ --5:0:10 6.1 20190609 -+5:0:10 6.1 20190615 -Index: dist.mk -Prereq: 1.1287 ---- ncurses-6.1-20190609+/dist.mk 2019-06-09 20:06:01.000000000 +0000 -+++ ncurses-6.1-20190615/dist.mk 2019-06-15 12:46:35.000000000 +0000 -@@ -25,7 +25,7 @@ - # use or other dealings in this Software without prior written # - # authorization. # - ############################################################################## --# $Id: dist.mk,v 1.1287 2019/06/09 20:06:01 tom Exp $ -+# $Id: dist.mk,v 1.1288 2019/06/15 12:46:35 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 = 6 - NCURSES_MINOR = 1 --NCURSES_PATCH = 20190609 -+NCURSES_PATCH = 20190615 - - # We don't append the patch to the version, since this only applies to releases - VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) -Index: doc/html/ada/funcs/T.htm ---- ncurses-6.1-20190609+/doc/html/ada/funcs/T.htm 2019-03-23 23:10:16.000000000 +0000 -+++ ncurses-6.1-20190615/doc/html/ada/funcs/T.htm 2019-06-15 23:31:13.000000000 +0000 -@@ -20,8 +20,8 @@ -
  • tgetnum -
  • tgetstr - terminal_interface-curses-termcap.adb:108 -
  • tgetstr - terminal_interface-curses-termcap.adb:129 --
  • tgoto -
  • TGoto -+
  • tgoto -
  • tigetflag -
  • tigetstr - terminal_interface-curses-terminfo.adb:87 -
  • tigetstr - terminal_interface-curses-terminfo.adb:108 -Index: doc/html/man/adacurses6-config.1.html ---- ncurses-6.1-20190609+/doc/html/man/adacurses6-config.1.html 2019-05-18 23:58:24.000000000 +0000 -+++ ncurses-6.1-20190615/doc/html/man/adacurses6-config.1.html 2019-06-15 23:31:08.000000000 +0000 -@@ -125,7 +125,7 @@ -

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20190609+/doc/html/man/captoinfo.1m.html	2019-05-18 23:58:24.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/captoinfo.1m.html	2019-06-15 23:31:08.000000000 +0000
-@@ -190,7 +190,7 @@
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/clear.1.html
---- ncurses-6.1-20190609+/doc/html/man/clear.1.html	2019-05-18 23:58:24.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/clear.1.html	2019-06-15 23:31:08.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
- 
-Index: doc/html/man/curs_variables.3x.html
---- ncurses-6.1-20190609+/doc/html/man/curs_variables.3x.html	2019-03-16 19:34:45.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/curs_variables.3x.html	2019-06-15 23:31:10.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_variables.3x,v 1.12 2019/02/16 23:43:23 tom Exp @
-+  * @Id: curs_variables.3x,v 1.13 2019/06/01 22:51:21 tom Exp @
- -->
- 
- 
-@@ -158,14 +158,18 @@
-            ch(3x) as well as the physical screen with mvcur(3x).
- 
-        o   This implementation uses the current value of TABSIZE only for  up-
--           dating  the  virtual  screen.   It  uses the terminal description's
--           init_tabs capability  for  computing  tab  stops  on  the  physical
--           screen.
-+           dating  the  virtual screen.  It uses the terminal description's it
-+           (init_tabs) capability for computing hardware tabs (i.e., tab stops
-+           on the physical screen).
- 
-        o   Other  implementations  differ.  For instance, NetBSD curses allows
-            TABSIZE to be set through an environment variable.  This  implemen-
-            tation does not.
- 
-+           NetBSD curses does not support hardware tabs; it uses the init_tabs
-+           capability and the TABSIZE variable only for updating  the  virtual
-+           screen.
-+
-        ESCDELAY is an extension in AIX curses:
- 
-        o   In AIX, the units for ESCDELAY are fifths of a millisecond.
-Index: doc/html/man/form.3x.html
---- ncurses-6.1-20190609+/doc/html/man/form.3x.html	2019-05-18 23:58:26.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/form.3x.html	2019-06-15 23:31:10.000000000 +0000
-@@ -246,7 +246,7 @@
-        curses(3x)  and  related  pages  whose names begin "form_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.1-20190609+/doc/html/man/infocmp.1m.html	2019-05-18 23:58:26.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/infocmp.1m.html	2019-06-15 23:31:11.000000000 +0000
-@@ -481,7 +481,7 @@
- 
-        https://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/infotocap.1m.html
---- ncurses-6.1-20190609+/doc/html/man/infotocap.1m.html	2019-05-18 23:58:26.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/infotocap.1m.html	2019-06-15 23:31:11.000000000 +0000
-@@ -85,7 +85,7 @@
-

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/menu.3x.html
---- ncurses-6.1-20190609+/doc/html/man/menu.3x.html	2019-05-18 23:58:26.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/menu.3x.html	2019-06-15 23:31:11.000000000 +0000
-@@ -221,7 +221,7 @@
-        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
- 
-Index: doc/html/man/menu_spacing.3x.html
---- ncurses-6.1-20190609+/doc/html/man/menu_spacing.3x.html	2019-03-16 19:34:46.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/menu_spacing.3x.html	2019-06-15 23:31:11.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -74,7 +74,7 @@
-        lines  between item rows, these lines will contain the pad character in
-        the appropriate positions.  The spc_columns parameter controls the num-
-        ber  of  blanks  between  columns of items.  It must not be larger than
--       TABSIZE.  A value of 0 for all the spacing values resets  them  to  the
-+       TABSIZE.  A value of 0 for all the spacing values resets  them  to  the
-        default, which is 1 for all of them.
-        The  function  menu_spacing  passes back the spacing info for the menu.
-        If a pointer is NULL, this specific info is simply not returned.
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.1-20190609+/doc/html/man/ncurses.3x.html	2019-05-18 23:58:27.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/ncurses.3x.html	2019-06-15 23:31:12.000000000 +0000
-@@ -59,7 +59,7 @@
-        method of updating  character  screens  with  reasonable  optimization.
-        This  implementation  is  "new  curses"  (ncurses)  and is the approved
-        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
-        The  ncurses  library emulates the curses library of System V Release 4
-        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-Index: doc/html/man/ncurses6-config.1.html
---- ncurses-6.1-20190609+/doc/html/man/ncurses6-config.1.html	2019-05-18 23:58:27.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/ncurses6-config.1.html	2019-06-15 23:31:12.000000000 +0000
-@@ -112,7 +112,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.1-20190609+/doc/html/man/panel.3x.html	2019-05-18 23:58:27.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/panel.3x.html	2019-06-15 23:31:12.000000000 +0000
-@@ -204,7 +204,7 @@
-

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/tabs.1.html
---- ncurses-6.1-20190609+/doc/html/man/tabs.1.html	2019-05-18 23:58:27.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/tabs.1.html	2019-06-15 23:31:12.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tabs.1,v 1.20 2019/02/16 23:56:38 tom Exp @
-+  * @Id: tabs.1,v 1.25 2019/06/15 23:08:12 tom Exp @
- -->
- 
- 
-@@ -70,7 +70,13 @@
-        tions running in the terminal, if at all.  Curses and other full-screen
-        applications  may  use  hardware tabs in optimizing their output to the
-        terminal.  If the hardware tabstops differ from the information in  the
--       terminal database, the result is unpredictable.
-+       terminal  database, the result is unpredictable.  Before running curses
-+       programs, you should either reset tab-stops to the standard interval
-+
-+           tabs -8
-+
-+       or use the reset program, since the normal initialization sequences  do
-+       not ensure that tab-stops are reset.
- 
- 
-

    OPTIONS

    -@@ -151,26 +157,51 @@
-        (POSIX.1-2008) describes a tabs utility.  However
- 
-        o   This  standard describes a +m option, to set a terminal's left-mar-
--           gin.  Very few of the entries in the terminal database provide this
--           capability.
-+           gin.  Very few of the entries in the terminal database provide  the
-+           smgl  (set_left_margin)  or smglp (set_left_margin_parm) capability
-+           needed to support the feature.
- 
--       o   There  is no counterpart in X/Open Curses Issue 7 for this utility,
-+       o   There is no counterpart in X/Open Curses Issue 7 for this  utility,
-            unlike tput(1).
- 
--       The -d (debug) and -n (no-op) options are extensions  not  provided  by
-+       The  -d  (debug)  and -n (no-op) options are extensions not provided by
-        other implementations.
- 
--       Documentation for other implementations states that there is a limit on
--       the number of tab stops.  While some terminals may not accept an  arbi-
--       trary  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.
-+       A tabs utility appeared in PWB/Unix 1.0 (1977), and thereafter in  3BSD
-+       (1979).  It supported a single "-n" option (to cause the first tab stop
-+       to be set on the left margin).  That option is not documented by POSIX.
-+       Initially, tabs used built-in tables rather than the terminal database,
-+       to support a half-dozen terminal types.  It also had built-in logic  to
-+       support  the left-margin, as well as a feature for copying the tab set-
-+       tings from a file.
-+
-+       Later versions of Unix, e.g., SVr4,  added  support  for  the  terminal
-+       database,  but  kept the tables, as a fallback.  In an earlier develop-
-+       ment effort, the tab-stop initialization provided by  tset  (1982)  and
-+       incorporated into tput uses the terminal database,
-+
-+       POSIX  documents  no  limits on the number of tab stops.  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.
-+
-+       The  Rationale section of the POSIX documentation goes into some detail
-+       about the ways the committee considered redesigning the tabs  and  tput
-+       utilities, without proposing an improved solution.  It comments that
-+
-+            no  known  historical  version  of tabs supports the capability of
-+            setting arbitrary tab stops.
-+
-+       However, the Explicit Lists described in this manual page  were  imple-
-+       mented  in  PWB/Unix.  Those provide the capability of setting abitrary
-+       tab stops.
- 
- 
-

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.1-20190609+/doc/html/man/terminfo.5.html	2019-05-18 23:58:27.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/terminfo.5.html	2019-06-15 23:31:12.000000000 +0000
-@@ -33,7 +33,7 @@
-   ****************************************************************************
-   * @Id: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp @
-   * Head of terminfo man page ends here
--  * @Id: terminfo.tail,v 1.90 2019/01/20 20:21:46 tom Exp @
-+  * @Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp @
-   * Beginning of terminfo.tail file
-   * This file is part of ncurses.
-   * See "terminfo.head" for copyright.
-@@ -74,7 +74,7 @@
-        Terminfo describes terminals by giving a set of capabilities which they
-        have, by specifying how to perform screen operations, and by specifying
-        padding  requirements  and  initialization  sequences.   This describes
--       ncurses version 6.1 (patch 20190518).
-+       ncurses version 6.1 (patch 20190615).
- 
- 
-

    Terminfo Entry Syntax

    -@@ -1326,7 +1326,7 @@
-        applies to storage scope terminals, such as TEKTRONIX 4010  series,  as
-        well  as  hard copy and APL terminals.)  If there is a code to move the
-        cursor to the left edge of the current row, give this as cr.  (Normally
--       this  will  be carriage return, control M.)  If there is a code to pro-
-+       this  will  be carriage return, control/M.)  If there is a code to pro-
-        duce an audible signal (bell, beep, etc) give this as bel.
- 
-        If there is a code to move the cursor one position to the left (such as
-@@ -1862,29 +1862,42 @@
- 
- 
-

    Tabs and Initialization

    --       If  the  terminal has hardware tabs, the command to advance to the next
--       tab stop can be given as ht (usually control I).  A "back-tab"  command
--       which moves leftward to the preceding tab stop can be given as cbt.  By
--       convention, if the teletype modes indicate that tabs are being expanded
--       by the computer rather than being sent to the terminal, programs should
--       not use ht or cbt even if they are present, since the user may not have
--       the  tab  stops  properly set.  If the terminal has hardware tabs which
--       are initially set every n spaces when the terminal is powered  up,  the
--       numeric  parameter  it  is given, showing the number of spaces the tabs
--       are set to.  This is normally used by the  tset  command  to  determine
--       whether  to set the mode for hardware tab expansion, and whether to set
--       the tab stops.  If the terminal has tab stops that can be saved in non-
--       volatile  memory,  the  terminfo  description  can assume that they are
--       properly set.
--
--       Other capabilities include is1, is2, and  is3,  initialization  strings
--       for  the  terminal, iprog, the path name of a program to be run to ini-
--       tialize the terminal, and if, the name of a file containing  long  ini-
--       tialization  strings.   These  strings are expected to set the terminal
--       into modes consistent with the rest of the terminfo description.   They
--       are  normally sent to the terminal, by the init option of the tput pro-
--       gram, each time the user logs in.  They will be printed in the  follow-
--       ing order:
-+       A few capabilities are used only for tabs:
-+
-+       o   If  the  terminal  has hardware tabs, the command to advance to the
-+           next tab stop can be given as ht (usually control/I).
-+
-+       o   A "back-tab" command which moves leftward to the preceding tab stop
-+           can be given as cbt.
-+
-+           By  convention,  if the teletype modes indicate that tabs are being
-+           expanded by the computer rather than being sent  to  the  terminal,
-+           programs  should  not use ht or cbt even if they are present, since
-+           the user may not have the tab stops properly set.
-+
-+       o   If the terminal has hardware tabs which are initially set  every  n
-+           spaces when the terminal is powered up, the numeric parameter it is
-+           given, showing the number of spaces the tabs are set to.
-+
-+           The it capability is normally used by the tset command to determine
-+           whether  to set the mode for hardware tab expansion, and whether to
-+           set the tab stops.  If the terminal has tab stops that can be saved
-+           in  non-volatile  memory,  the terminfo description can assume that
-+           they are properly set.
-+
-+       Other capabilities include
-+
-+       o   is1, is2, and is3, initialization strings for the terminal,
-+
-+       o   iprog, the path name of a program to be run to initialize the  ter-
-+           minal,
-+
-+       o   and if, the name of a file containing long initialization strings.
-+
-+       These  strings  are  expected to set the terminal into modes consistent
-+       with the rest of the terminfo description.  They are normally  sent  to
-+       the  terminal,  by  the  init option of the tput program, each time the
-+       user logs in.  They will be printed in the following order:
- 
-               run the program
-                      iprog
-@@ -1903,92 +1916,114 @@
-               and finally
-                      output is3.
- 
--       Most  initialization  is  done with is2.  Special terminal modes can be
--       set up without duplicating strings by putting the common  sequences  in
-+       Most initialization is done with is2.  Special terminal  modes  can  be
-+       set  up  without duplicating strings by putting the common sequences in
-        is2 and special cases in is1 and is3.
- 
--       A  set  of  sequences  that  does a harder reset from a totally unknown
-+       A set of sequences that does a harder  reset  from  a  totally  unknown
-        state can be given as rs1, rs2, rf and rs3, analogous to is1 , is2 , if
--       and  is3  respectively.  These strings are output by the reset program,
--       which is used when the terminal gets into a wedged state.  Commands are
--       normally  placed  in  rs1, rs2 rs3 and rf only if they produce annoying
--       effects on the screen and are not necessary when logging in.  For exam-
--       ple, the command to set the vt100 into 80-column mode would normally be
--       part of is2, but it causes an annoying glitch of the screen and is  not
--       normally  needed  since  the  terminal  is usually already in 80 column
--       mode.
--
--       The reset program writes strings including iprog,  etc.,  in  the  same
--       order  as  the  init program, using rs1, etc., instead of is1, etc.  If
--       any of rs1, rs2, rs3, or rf reset capability strings are  missing,  the
-+       and is3 respectively.  These strings are output by  the  reset  program
-+       (an  alias of tset), which is used when the terminal gets into a wedged
-+       state.  Commands are normally placed in rs1, rs2 rs3  and  rf  only  if
-+       they  produce annoying effects on the screen and are not necessary when
-+       logging in.  For example, the command to set the vt100  into  80-column
-+       mode would normally be part of is2, but it causes an annoying glitch of
-+       the screen and is not normally needed since  the  terminal  is  usually
-+       already in 80 column mode.
-+
-+       The  reset  program  writes  strings including iprog, etc., in the same
-+       order as the init program, using rs1, etc., instead of  is1,  etc.   If
-+       any  of  rs1, rs2, rs3, or rf reset capability strings are missing, the
-        reset program falls back upon the corresponding initialization capabil-
-        ity string.
- 
--       If there are commands to set and clear tab stops, they can be given  as
-+       If  there are commands to set and clear tab stops, they can be given as
-        tbc (clear all tab stops) and hts (set a tab stop in the current column
--       of every row).  If a more complex sequence is needed to  set  the  tabs
-+       of  every  row).   If a more complex sequence is needed to set the tabs
-        than can be described by this, the sequence can be placed in is2 or if.
- 
-+       The tput reset command uses the same capability strings  as  the  reset
-+       command,  although  the two programs (tput and reset) provide different
-+       command-line options.
-+
-+       In practice, these terminfo capabilities are not often used in initial-
-+       ization of tabs (though they are required for the tabs program):
-+
-+       o   Almost all hardware terminals (at least those which supported tabs)
-+           initialized those to every eight columns:
-+
-+           The only exception was the AT&T 2300  series,  which  set  tabs  to
-+           every five columns.
-+
-+       o   In  particular, developers of the hardware terminals which are com-
-+           monly used as models for modern terminal emulators  provided  docu-
-+           mentation demonstrating that eight columns were the standard.
-+
-+       o   Because of this, the terminal initialization programs tput and tset
-+           use  the  tbc  (clear_all_tabs)  and  hts  (set_tab)   capabilities
-+           directly  only when the it (init_tabs) capability is set to a value
-+           other than eight.
-+
- 
-

    Delays and Padding

    --       Many  older  and slower terminals do not support either XON/XOFF or DTR
--       handshaking, including hard copy terminals and some very  archaic  CRTs
--       (including,  for example, DEC VT100s).  These may require padding char-
-+       Many older and slower terminals do not support either XON/XOFF  or  DTR
-+       handshaking,  including  hard copy terminals and some very archaic CRTs
-+       (including, for example, DEC VT100s).  These may require padding  char-
-        acters after certain cursor motions and screen changes.
- 
-        If the terminal uses xon/xoff handshaking for flow control (that is, it
--       automatically  emits  ^S  back  to  the host when its input buffers are
--       close to full), set xon.  This capability suppresses  the  emission  of
--       padding.   You can also set it for memory-mapped console devices effec-
--       tively that do not have a  speed  limit.   Padding  information  should
-+       automatically emits ^S back to the host  when  its  input  buffers  are
-+       close  to  full),  set xon.  This capability suppresses the emission of
-+       padding.  You can also set it for memory-mapped console devices  effec-
-+       tively  that  do  not  have  a speed limit.  Padding information should
-        still be included so that routines can make better decisions about rel-
-        ative costs, but actual pad characters will not be transmitted.
- 
-        If pb (padding baud rate) is given, padding is suppressed at baud rates
--       below  the  value  of  pb.  If the entry has no padding baud rate, then
-+       below the value of pb.  If the entry has no  padding  baud  rate,  then
-        whether padding is emitted or not is completely controlled by xon.
- 
--       If the terminal requires other than a null (zero) character as  a  pad,
--       then  this  can  be  given as pad.  Only the first character of the pad
-+       If  the  terminal requires other than a null (zero) character as a pad,
-+       then this can be given as pad.  Only the first  character  of  the  pad
-        string is used.
- 
- 
-

    Status Lines

    --       Some terminals have an extra "status line" which is not  normally  used
-+       Some  terminals  have an extra "status line" which is not normally used
-        by software (and thus not counted in the terminal's lines capability).
- 
--       The  simplest case is a status line which is cursor-addressable but not
-+       The simplest case is a status line which is cursor-addressable but  not
-        part of the main scrolling region on the screen; the Heathkit H19 has a
--       status  line  of  this  kind,  as  would a 24-line VT100 with a 23-line
-+       status line of this kind, as would  a  24-line  VT100  with  a  23-line
-        scrolling region set up on initialization.  This situation is indicated
-        by the hs capability.
- 
--       Some  terminals  with status lines need special sequences to access the
--       status line.  These may be expressed as a string with single  parameter
--       tsl  which takes the cursor to a given zero-origin column on the status
--       line.  The capability fsl must return to the main-screen  cursor  posi-
--       tions  before the last tsl.  You may need to embed the string values of
--       sc (save cursor) and rc (restore cursor) in tsl and fsl  to  accomplish
-+       Some terminals with status lines need special sequences to  access  the
-+       status  line.  These may be expressed as a string with single parameter
-+       tsl which takes the cursor to a given zero-origin column on the  status
-+       line.   The  capability fsl must return to the main-screen cursor posi-
-+       tions before the last tsl.  You may need to embed the string values  of
-+       sc  (save  cursor) and rc (restore cursor) in tsl and fsl to accomplish
-        this.
- 
--       The  status  line is normally assumed to be the same width as the width
--       of the terminal.  If this is  untrue,  you  can  specify  it  with  the
-+       The status line is normally assumed to be the same width as  the  width
-+       of  the  terminal.   If  this  is  untrue,  you can specify it with the
-        numeric capability wsl.
- 
-        A command to erase or blank the status line may be specified as dsl.
- 
--       The  boolean  capability  eslok  specifies that escape sequences, tabs,
-+       The boolean capability eslok specifies  that  escape  sequences,  tabs,
-        etc., work ordinarily in the status line.
- 
--       The ncurses implementation does not yet use any of these  capabilities.
-+       The  ncurses implementation does not yet use any of these capabilities.
-        They are documented here in case they ever become important.
- 
- 
-

    Line Graphics

    --       Many  terminals have alternate character sets useful for forms-drawing.
-+       Many terminals have alternate character sets useful for  forms-drawing.
-        Terminfo and curses have built-in support for most of the drawing char-
--       acters  supported  by  the  VT100,  with  some characters from the AT&T
--       4410v1 added.  This alternate character set may  be  specified  by  the
-+       acters supported by the VT100,  with  some  characters  from  the  AT&T
-+       4410v1  added.   This  alternate  character set may be specified by the
-        acsc capability.
- 
-          Glyph                       ACS            Ascii     acsc     acsc
-@@ -2004,7 +2039,6 @@
-          degree symbol               ACS_DEGREE     \         f        0x66
-          plus/minus                  ACS_PLMINUS    #         g        0x67
-          board of squares            ACS_BOARD      #         h        0x68
--
-          lantern symbol              ACS_LANTERN    #         i        0x69
-          lower right corner          ACS_LRCORNER   +         j        0x6a
-          upper right corner          ACS_URCORNER   +         k        0x6b
-@@ -2030,34 +2064,34 @@
- 
-        A few notes apply to the table itself:
- 
--       o   X/Open  Curses  incorrectly  states that the mapping for lantern is
--           uppercase "I" although Unix implementations use the  lowercase  "i"
-+       o   X/Open Curses incorrectly states that the mapping  for  lantern  is
-+           uppercase  "I"  although Unix implementations use the lowercase "i"
-            mapping.
- 
--       o   The  DEC  VT100  implemented graphics using the alternate character
--           set feature, temporarily switching modes and sending characters  in
-+       o   The DEC VT100 implemented graphics using  the  alternate  character
-+           set  feature, temporarily switching modes and sending characters in
-            the range 0x60 (96) to 0x7e (126) (the acsc Value column in the ta-
-            ble).
- 
-        o   The AT&T terminal added graphics characters outside that range.
- 
--           Some of the characters within the range do  not  match  the  VT100;
--           presumably  they  were  used in the AT&T terminal: board of squares
--           replaces the VT100 newline symbol, while  lantern  symbol  replaces
-+           Some  of  the  characters  within the range do not match the VT100;
-+           presumably they were used in the AT&T terminal:  board  of  squares
-+           replaces  the  VT100  newline symbol, while lantern symbol replaces
-            the VT100 vertical tab symbol.  The other VT100 symbols for control
--           characters (horizontal tab, carriage return and line-feed) are  not
-+           characters  (horizontal tab, carriage return and line-feed) are not
-            (re)used in curses.
- 
--       The  best  way to define a new device's graphics set is to add a column
--       to a copy of this table for your terminal, giving the  character  which
--       (when  emitted  between  smacs/rmacs  switches) will be rendered as the
-+       The best way to define a new device's graphics set is to add  a  column
-+       to  a  copy of this table for your terminal, giving the character which
-+       (when emitted between smacs/rmacs switches) will  be  rendered  as  the
-        corresponding graphic.  Then read off the VT100/your terminal character
-        pairs right to left in sequence; these become the ACSC string.
- 
- 
-

    Color Handling

    --       The  curses  library  functions init_pair and init_color manipulate the
--       color  pairs  and  color  values  discussed  in   this   section   (see
-+       The curses library functions init_pair and  init_color  manipulate  the
-+       color   pairs   and   color  values  discussed  in  this  section  (see
-        curs_color(3x) for details on these and related functions).
- 
-        Most color terminals are either "Tektronix-like" or "HP-like":
-@@ -2066,43 +2100,43 @@
-            is usually 8), and can set character-cell foreground and background
-            characters independently, mixing them into N * N color-pairs.
- 
--       o   On  HP-like  terminals,  the user must set each color pair up sepa-
--           rately (foreground and background are not independently  settable).
-+       o   On HP-like terminals, the user must set each color  pair  up  sepa-
-+           rately  (foreground and background are not independently settable).
-            Up to M color-pairs may be set up from 2*M different colors.  ANSI-
-            compatible terminals are Tektronix-like.
- 
-        Some basic color capabilities are independent of the color method.  The
--       numeric  capabilities  colors  and pairs specify the maximum numbers of
--       colors and color-pairs that can be displayed  simultaneously.   The  op
-+       numeric capabilities colors and pairs specify the  maximum  numbers  of
-+       colors  and  color-pairs  that can be displayed simultaneously.  The op
-        (original pair) string resets foreground and background colors to their
--       default values for the terminal.  The oc string resets  all  colors  or
--       color-pairs  to  their default values for the terminal.  Some terminals
-+       default  values  for  the terminal.  The oc string resets all colors or
-+       color-pairs to their default values for the terminal.   Some  terminals
-        (including many PC terminal emulators) erase screen areas with the cur-
--       rent  background  color  rather  than  the power-up default background;
-+       rent background color rather  than  the  power-up  default  background;
-        these should have the boolean capability bce.
- 
-        While the curses library works with color pairs (reflecting the inabil-
--       ity  of  some  devices to set foreground and background colors indepen-
-+       ity of some devices to set foreground and  background  colors  indepen-
-        dently), there are separate capabilities for setting these features:
- 
--       o   To change the current foreground or  background  color  on  a  Tek-
--           tronix-type  terminal,  use  setaf  (set ANSI foreground) and setab
--           (set ANSI background) or setf (set foreground) and setb (set  back-
--           ground).   These  take  one  parameter, the color number.  The SVr4
--           documentation describes only setaf/setab; the XPG4 draft says  that
--           "If  the  terminal supports ANSI escape sequences to set background
--           and foreground, they should be coded as setaf  and  setab,  respec-
-+       o   To  change  the  current  foreground  or background color on a Tek-
-+           tronix-type terminal, use setaf (set  ANSI  foreground)  and  setab
-+           (set  ANSI background) or setf (set foreground) and setb (set back-
-+           ground).  These take one parameter, the  color  number.   The  SVr4
-+           documentation  describes only setaf/setab; the XPG4 draft says that
-+           "If the terminal supports ANSI escape sequences to  set  background
-+           and  foreground,  they  should be coded as setaf and setab, respec-
-            tively.
- 
--       o   If  the  terminal supports other escape sequences to set background
--           and foreground, they should be coded  as  setf  and  setb,  respec-
--           tively.   The  vidputs  and the refresh(3x) functions use the setaf
-+       o   If the terminal supports other escape sequences to  set  background
-+           and  foreground,  they  should  be  coded as setf and setb, respec-
-+           tively.  The vidputs and the refresh(3x) functions  use  the  setaf
-            and setab capabilities if they are defined.
- 
--       The setaf/setab and setf/setb capabilities take a single numeric  argu-
--       ment  each.  Argument values 0-7 of setaf/setab are portably defined as
--       follows (the middle column is the symbolic  #define  available  in  the
--       header  for the curses or ncurses libraries).  The terminal hardware is
-+       The  setaf/setab and setf/setb capabilities take a single numeric argu-
-+       ment each.  Argument values 0-7 of setaf/setab are portably defined  as
-+       follows  (the  middle  column  is the symbolic #define available in the
-+       header for the curses or ncurses libraries).  The terminal hardware  is
-        free to map these as it likes, but the RGB values indicate normal loca-
-        tions in color space.
- 
-@@ -2112,6 +2146,7 @@
-                     green     COLOR_GREEN       2     0,max,0
-                     yellow    COLOR_YELLOW      3     max,max,0
-                     blue      COLOR_BLUE        4     0,0,max
-+
-                     magenta   COLOR_MAGENTA     5     max,0,max
-                     cyan      COLOR_CYAN        6     0,max,max
-                     white     COLOR_WHITE       7     max,max,max
-@@ -2132,28 +2167,28 @@
-        It is important to not confuse the two sets of color capabilities; oth-
-        erwise red/blue will be interchanged on the display.
- 
--       On  an  HP-like terminal, use scp with a color-pair number parameter to
-+       On an HP-like terminal, use scp with a color-pair number  parameter  to
-        set which color pair is current.
- 
-        Some terminals allow the color values to be modified:
- 
--       o   On a Tektronix-like terminal, the capability ccc may be present  to
--           indicate  that colors can be modified.  If so, the initc capability
-+       o   On  a Tektronix-like terminal, the capability ccc may be present to
-+           indicate that colors can be modified.  If so, the initc  capability
-            will take a color number (0 to colors - 1)and three more parameters
--           which  describe the color.  These three parameters default to being
-+           which describe the color.  These three parameters default to  being
-            interpreted as RGB (Red, Green, Blue) values.  If the boolean capa-
--           bility  hls  is  present,  they are instead as HLS (Hue, Lightness,
-+           bility hls is present, they are instead  as  HLS  (Hue,  Lightness,
-            Saturation) indices.  The ranges are terminal-dependent.
- 
--       o   On an HP-like terminal, initp may give a capability for changing  a
-+       o   On  an HP-like terminal, initp may give a capability for changing a
-            color-pair value.  It will take seven parameters; a color-pair num-
--           ber (0 to max_pairs - 1), and two triples  describing  first  back-
--           ground  and then foreground colors.  These parameters must be (Red,
-+           ber  (0  to  max_pairs - 1), and two triples describing first back-
-+           ground and then foreground colors.  These parameters must be  (Red,
-            Green, Blue) or (Hue, Lightness, Saturation) depending on hls.
- 
--       On some color terminals, colors collide with highlights.  You can  reg-
--       ister  these collisions with the ncv capability.  This is a bit-mask of
--       attributes not to be used when colors are enabled.  The  correspondence
-+       On  some color terminals, colors collide with highlights.  You can reg-
-+       ister these collisions with the ncv capability.  This is a bit-mask  of
-+       attributes  not to be used when colors are enabled.  The correspondence
-        with the attributes understood by curses is as follows:
- 
-                   Attribute              Bit   Decimal      Set by
-@@ -2174,134 +2209,134 @@
-                   A_VERTICAL             14    16384        sgr1
-                   A_ITALIC               15    32768        sitm
- 
--       For  example, on many IBM PC consoles, the underline attribute collides
--       with the foreground color blue and is  not  available  in  color  mode.
-+       For example, on many IBM PC consoles, the underline attribute  collides
-+       with  the  foreground  color  blue  and is not available in color mode.
-        These should have an ncv capability of 2.
- 
--       SVr4  curses does nothing with ncv, ncurses recognizes it and optimizes
-+       SVr4 curses does nothing with ncv, ncurses recognizes it and  optimizes
-        the output in favor of colors.
- 
- 
-

    Miscellaneous

    --       If the terminal requires other than a null (zero) character as  a  pad,
--       then  this  can  be  given as pad.  Only the first character of the pad
-+       If  the  terminal requires other than a null (zero) character as a pad,
-+       then this can be given as pad.  Only the first  character  of  the  pad
-        string is used.  If the terminal does not have a pad character, specify
--       npc.   Note that ncurses implements the termcap-compatible PC variable;
--       though the application may set this value to  something  other  than  a
--       null,  ncurses will test npc first and use napms if the terminal has no
-+       npc.  Note that ncurses implements the termcap-compatible PC  variable;
-+       though  the  application  may  set this value to something other than a
-+       null, ncurses will test npc first and use napms if the terminal has  no
-        pad character.
- 
--       If the terminal can move up or down half a line, this can be  indicated
-+       If  the terminal can move up or down half a line, this can be indicated
-        with hu (half-line up) and hd (half-line down).  This is primarily use-
-        ful for superscripts and subscripts on hard-copy terminals.  If a hard-
--       copy  terminal  can eject to the next page (form feed), give this as ff
--       (usually control L).
-+       copy terminal can eject to the next page (form feed), give this  as  ff
-+       (usually control/L).
- 
--       If there is a command to repeat a given character  a  given  number  of
--       times  (to  save  time transmitting a large number of identical charac-
--       ters) this can be indicated with the  parameterized  string  rep.   The
--       first  parameter  is the character to be repeated and the second is the
-+       If  there  is  a  command to repeat a given character a given number of
-+       times (to save time transmitting a large number  of  identical  charac-
-+       ters)  this  can  be  indicated with the parameterized string rep.  The
-+       first parameter is the character to be repeated and the second  is  the
-        number of times to repeat it.  Thus, tparm(repeat_char, 'x', 10) is the
-        same as "xxxxxxxxxx".
- 
-        If the terminal has a settable command character, such as the TEKTRONIX
--       4025, this can be indicated with cmdch.  A prototype command  character
--       is  chosen  which is used in all capabilities.  This character is given
--       in the cmdch capability to identify it.  The  following  convention  is
-+       4025,  this can be indicated with cmdch.  A prototype command character
-+       is chosen which is used in all capabilities.  This character  is  given
-+       in  the  cmdch  capability to identify it.  The following convention is
-        supported on some UNIX systems: The environment is to be searched for a
--       CC variable, and if found, all occurrences of the  prototype  character
-+       CC  variable,  and if found, all occurrences of the prototype character
-        are replaced with the character in the environment variable.
- 
--       Terminal  descriptions  that  do not represent a specific kind of known
--       terminal, such as switch, dialup, patch, and  network,  should  include
--       the  gn (generic) capability so that programs can complain that they do
--       not know how to talk to the terminal.  (This capability does not  apply
--       to  virtual  terminal  descriptions  for which the escape sequences are
-+       Terminal descriptions that do not represent a specific  kind  of  known
-+       terminal,  such  as  switch, dialup, patch, and network, should include
-+       the gn (generic) capability so that programs can complain that they  do
-+       not  know how to talk to the terminal.  (This capability does not apply
-+       to virtual terminal descriptions for which  the  escape  sequences  are
-        known.)
- 
-        If the terminal has a "meta key" which acts as a shift key, setting the
--       8th  bit  of any character transmitted, this fact can be indicated with
--       km.  Otherwise, software will assume that the 8th bit is parity and  it
--       will  usually be cleared.  If strings exist to turn this "meta mode" on
-+       8th bit of any character transmitted, this fact can be  indicated  with
-+       km.   Otherwise, software will assume that the 8th bit is parity and it
-+       will usually be cleared.  If strings exist to turn this "meta mode"  on
-        and off, they can be given as smm and rmm.
- 
-        If the terminal has more lines of memory than will fit on the screen at
--       once,  the number of lines of memory can be indicated with lm.  A value
-+       once, the number of lines of memory can be indicated with lm.  A  value
-        of lm#0 indicates that the number of lines is not fixed, but that there
-        is still more memory than fits on the screen.
- 
--       If  the terminal is one of those supported by the UNIX virtual terminal
-+       If the terminal is one of those supported by the UNIX virtual  terminal
-        protocol, the terminal number can be given as vt.
- 
--       Media copy strings which control an auxiliary printer connected to  the
--       terminal  can  be  given as mc0: print the contents of the screen, mc4:
--       turn off the printer, and mc5: turn on the printer.  When  the  printer
--       is  on,  all text sent to the terminal will be sent to the printer.  It
--       is undefined whether the text is also displayed on the terminal  screen
--       when  the  printer  is  on.   A variation mc5p takes one parameter, and
-+       Media  copy strings which control an auxiliary printer connected to the
-+       terminal can be given as mc0: print the contents of  the  screen,  mc4:
-+       turn  off  the printer, and mc5: turn on the printer.  When the printer
-+       is on, all text sent to the terminal will be sent to the  printer.   It
-+       is  undefined whether the text is also displayed on the terminal screen
-+       when the printer is on.  A variation  mc5p  takes  one  parameter,  and
-        leaves the printer on for as many characters as the value of the param-
-        eter, then turns the printer off.  The parameter should not exceed 255.
--       All text, including mc4, is transparently passed to the  printer  while
-+       All  text,  including mc4, is transparently passed to the printer while
-        an mc5p is in effect.
- 
- 
-

    Glitches and Braindamage

    --       Hazeltine  terminals, which do not allow "~" characters to be displayed
-+       Hazeltine terminals, which do not allow "~" characters to be  displayed
-        should indicate hz.
- 
--       Terminals which ignore a line-feed immediately after an am  wrap,  such
-+       Terminals  which  ignore a line-feed immediately after an am wrap, such
-        as the Concept and vt100, should indicate xenl.
- 
--       If  el  is  required  to get rid of standout (instead of merely writing
-+       If el is required to get rid of standout  (instead  of  merely  writing
-        normal text on top of it), xhp should be given.
- 
-        Teleray terminals, where tabs turn all characters moved over to blanks,
--       should  indicate  xt (destructive tabs).  Note: the variable indicating
--       this is now "dest_tabs_magic_smso"; in  older  versions,  it  was  tel-
-+       should indicate xt (destructive tabs).  Note: the  variable  indicating
-+       this  is  now  "dest_tabs_magic_smso";  in  older versions, it was tel-
-        eray_glitch.  This glitch is also taken to mean that it is not possible
-        to position the cursor on top of a "magic cookie", that to erase stand-
--       out  mode  it  is instead necessary to use delete and insert line.  The
-+       out mode it is instead necessary to use delete and  insert  line.   The
-        ncurses implementation ignores this glitch.
- 
--       The Beehive Superbee, which is unable to correctly transmit the  escape
--       or  control  C  characters, has xsb, indicating that the f1 key is used
--       for escape and f2 for control C.  (Only  certain  Superbees  have  this
--       problem,  depending on the ROM.)  Note that in older terminfo versions,
-+       The  Beehive Superbee, which is unable to correctly transmit the escape
-+       or control/C characters, has xsb, indicating that the f1  key  is  used
-+       for  escape  and  f2  for control/C.  (Only certain Superbees have this
-+       problem, depending on the ROM.)  Note that in older terminfo  versions,
-        this capability was called "beehive_glitch"; it is now "no_esc_ctl_c".
- 
--       Other specific terminal problems may be corrected by adding more  capa-
-+       Other  specific terminal problems may be corrected by adding more capa-
-        bilities of the form xx.
- 
- 
-

    Pitfalls of Long Entries

    --       Long  terminfo  entries are unlikely to be a problem; to date, no entry
--       has even approached terminfo's 4096-byte string-table maximum.   Unfor-
--       tunately,  the  termcap translations are much more strictly limited (to
--       1023 bytes), thus termcap translations of  long  terminfo  entries  can
-+       Long terminfo entries are unlikely to be a problem; to date,  no  entry
-+       has  even approached terminfo's 4096-byte string-table maximum.  Unfor-
-+       tunately, the termcap translations are much more strictly  limited  (to
-+       1023  bytes),  thus  termcap  translations of long terminfo entries can
-        cause problems.
- 
--       The  man  pages  for  4.3BSD and older versions of tgetent instruct the
--       user to allocate a 1024-byte buffer for the termcap entry.   The  entry
--       gets  null-terminated by the termcap library, so that makes the maximum
--       safe length for a termcap entry 1k-1 (1023) bytes.  Depending  on  what
--       the  application  and the termcap library being used does, and where in
--       the termcap file the terminal type that tgetent is  searching  for  is,
-+       The man pages for 4.3BSD and older versions  of  tgetent  instruct  the
-+       user  to  allocate a 1024-byte buffer for the termcap entry.  The entry
-+       gets null-terminated by the termcap library, so that makes the  maximum
-+       safe  length  for a termcap entry 1k-1 (1023) bytes.  Depending on what
-+       the application and the termcap library being used does, and  where  in
-+       the  termcap  file  the terminal type that tgetent is searching for is,
-        several bad things can happen.
- 
--       Some  termcap libraries print a warning message or exit if they find an
-+       Some termcap libraries print a warning message or exit if they find  an
-        entry that's longer than 1023 bytes; others do not; others truncate the
--       entries  to  1023  bytes.  Some application programs allocate more than
-+       entries to 1023 bytes.  Some application programs  allocate  more  than
-        the recommended 1K for the termcap entry; others do not.
- 
--       Each termcap entry has two important sizes associated with  it:  before
--       "tc"  expansion, and after "tc" expansion.  "tc" is the capability that
-+       Each  termcap  entry has two important sizes associated with it: before
-+       "tc" expansion, and after "tc" expansion.  "tc" is the capability  that
-        tacks on another termcap entry to the end of the current one, to add on
-        its capabilities.  If a termcap entry does not use the "tc" capability,
-        then of course the two lengths are the same.
- 
--       The "before tc expansion" length is the most important one, because  it
--       affects  more than just users of that particular terminal.  This is the
--       length of the entry as it exists in /etc/termcap, minus the  backslash-
-+       The  "before tc expansion" length is the most important one, because it
-+       affects more than just users of that particular terminal.  This is  the
-+       length  of the entry as it exists in /etc/termcap, minus the backslash-
-        newline pairs, which tgetent strips out while reading it.  Some termcap
-        libraries strip off the final newline, too (GNU termcap does not).  Now
-        suppose:
-@@ -2310,87 +2345,87 @@
- 
-        o   and the application has only allocated a 1k buffer,
- 
--       o   and  the termcap library (like the one in BSD/OS 1.1 and GNU) reads
--           the whole entry into the buffer, no matter what its length, to  see
-+       o   and the termcap library (like the one in BSD/OS 1.1 and GNU)  reads
-+           the  whole entry into the buffer, no matter what its length, to see
-            if it is the entry it wants,
- 
--       o   and  tgetent  is  searching  for a terminal type that either is the
--           long entry, appears in the termcap file after the  long  entry,  or
--           does  not  appear in the file at all (so that tgetent has to search
-+       o   and tgetent is searching for a terminal type  that  either  is  the
-+           long  entry,  appears  in the termcap file after the long entry, or
-+           does not appear in the file at all (so that tgetent has  to  search
-            the whole termcap file).
- 
--       Then tgetent will overwrite memory, perhaps  its  stack,  and  probably
--       core  dump the program.  Programs like telnet are particularly vulnera-
--       ble; modern telnets pass along values like the terminal type  automati-
--       cally.   The  results are almost as undesirable with a termcap library,
--       like SunOS 4.1.3 and Ultrix 4.4, that prints warning messages  when  it
--       reads  an  overly  long  termcap entry.  If a termcap library truncates
--       long entries, like OSF/1 3.0, it is  immune  to  dying  here  but  will
-+       Then  tgetent  will  overwrite  memory, perhaps its stack, and probably
-+       core dump the program.  Programs like telnet are particularly  vulnera-
-+       ble;  modern telnets pass along values like the terminal type automati-
-+       cally.  The results are almost as undesirable with a  termcap  library,
-+       like  SunOS  4.1.3 and Ultrix 4.4, that prints warning messages when it
-+       reads an overly long termcap entry.  If  a  termcap  library  truncates
-+       long  entries,  like  OSF/1  3.0,  it  is immune to dying here but will
-        return incorrect data for the terminal.
- 
--       The  "after  tc  expansion"  length  will  have a similar effect to the
-+       The "after tc expansion" length will  have  a  similar  effect  to  the
-        above, but only for people who actually set TERM to that terminal type,
--       since  tgetent  only  does "tc" expansion once it is found the terminal
-+       since tgetent only does "tc" expansion once it is  found  the  terminal
-        type it was looking for, not while searching.
- 
--       In summary, a termcap entry that is longer than 1023 bytes  can  cause,
--       on  various  combinations of termcap libraries and applications, a core
--       dump, warnings, or incorrect operation.  If it is too long even  before
--       "tc"  expansion,  it will have this effect even for users of some other
--       terminal types and users whose TERM variable does not  have  a  termcap
-+       In  summary,  a termcap entry that is longer than 1023 bytes can cause,
-+       on various combinations of termcap libraries and applications,  a  core
-+       dump,  warnings, or incorrect operation.  If it is too long even before
-+       "tc" expansion, it will have this effect even for users of  some  other
-+       terminal  types  and  users whose TERM variable does not have a termcap
-        entry.
- 
--       When  in  -C (translate to termcap) mode, the ncurses implementation of
--       tic(1m) issues warning messages when the pre-tc  length  of  a  termcap
--       translation  is  too  long.  The -c (check) option also checks resolved
-+       When in -C (translate to termcap) mode, the ncurses  implementation  of
-+       tic(1m)  issues  warning  messages  when the pre-tc length of a termcap
-+       translation is too long.  The -c (check) option  also  checks  resolved
-        (after tc expansion) lengths.
- 
- 
-

    Binary Compatibility

    --       It is not wise to count  on  portability  of  binary  terminfo  entries
--       between  commercial  UNIX  versions.   The problem is that there are at
--       least two versions of terminfo (under HP-UX  and  AIX)  which  diverged
--       from  System  V terminfo after SVr1, and have added extension capabili-
--       ties to the string table that (in the binary format) collide with  Sys-
-+       It  is  not  wise  to  count  on portability of binary terminfo entries
-+       between commercial UNIX versions.  The problem is  that  there  are  at
-+       least  two  versions  of  terminfo (under HP-UX and AIX) which diverged
-+       from System V terminfo after SVr1, and have added  extension  capabili-
-+       ties  to the string table that (in the binary format) collide with Sys-
-        tem V and XSI Curses extensions.
- 
- 
-

    EXTENSIONS

    --       Searching   for  terminal  descriptions  in  $HOME/.terminfo  and  TER-
-+       Searching  for  terminal  descriptions  in  $HOME/.terminfo  and   TER-
-        MINFO_DIRS is not supported by older implementations.
- 
--       Some SVr4 curses implementations, and all  previous  to  SVr4,  do  not
-+       Some  SVr4  curses  implementations,  and  all previous to SVr4, do not
-        interpret the %A and %O operators in parameter strings.
- 
--       SVr4/XPG4  do  not  specify  whether msgr licenses movement while in an
--       alternate-character-set mode (such modes may, among other  things,  map
--       CR  and  NL  to  characters  that  do  not trigger local motions).  The
--       ncurses implementation ignores msgr in ALTCHARSET  mode.   This  raises
--       the  possibility that an XPG4 implementation making the opposite inter-
--       pretation may need terminfo entries  made  for  ncurses  to  have  msgr
-+       SVr4/XPG4 do not specify whether msgr licenses  movement  while  in  an
-+       alternate-character-set  mode  (such modes may, among other things, map
-+       CR and NL to characters  that  do  not  trigger  local  motions).   The
-+       ncurses  implementation  ignores  msgr in ALTCHARSET mode.  This raises
-+       the possibility that an XPG4 implementation making the opposite  inter-
-+       pretation  may  need  terminfo  entries  made  for ncurses to have msgr
-        turned off.
- 
-        The ncurses library handles insert-character and insert-character modes
--       in a slightly non-standard way to get better  update  efficiency.   See
-+       in  a  slightly  non-standard way to get better update efficiency.  See
-        the Insert/Delete Character subsection above.
- 
--       The  parameter  substitutions  for  set_clock and display_clock are not
--       documented in SVr4 or the XSI Curses standard.  They are  deduced  from
-+       The parameter substitutions for set_clock  and  display_clock  are  not
-+       documented  in  SVr4 or the XSI Curses standard.  They are deduced from
-        the documentation for the AT&T 505 terminal.
- 
--       Be  careful  assigning the kmous capability.  The ncurses library wants
--       to interpret it as KEY_MOUSE, for use by terminals and  emulators  like
--       xterm  that can return mouse-tracking information in the keyboard-input
-+       Be careful assigning the kmous capability.  The ncurses  library  wants
-+       to  interpret  it as KEY_MOUSE, for use by terminals and emulators like
-+       xterm that can return mouse-tracking information in the  keyboard-input
-        stream.
- 
--       X/Open Curses does not mention  italics.   Portable  applications  must
--       assume  that  numeric  capabilities  are  signed  16-bit  values.  This
--       includes the no_color_video (ncv) capability.   The  32768  mask  value
--       used  for  italics with ncv can be confused with an absent or cancelled
--       ncv.  If italics should work with colors, then the ncv  value  must  be
-+       X/Open  Curses  does  not  mention italics.  Portable applications must
-+       assume that  numeric  capabilities  are  signed  16-bit  values.   This
-+       includes  the  no_color_video  (ncv)  capability.  The 32768 mask value
-+       used for italics with ncv can be confused with an absent  or  cancelled
-+       ncv.   If  italics  should work with colors, then the ncv value must be
-        specified, even if it is zero.
- 
--       Different  commercial  ports  of  terminfo and curses support different
-+       Different commercial ports of terminfo  and  curses  support  different
-        subsets of the XSI Curses standard and (in some cases) different exten-
-        sion sets.  Here is a summary, accurate as of October 1995:
- 
-@@ -2400,15 +2435,15 @@
-            capability (set_pglen).
- 
-        o   SVr1, Ultrix -- These support a restricted subset of terminfo capa-
--           bilities.   The  booleans  end  with  xon_xoff;  the  numerics with
-+           bilities.  The  booleans  end  with  xon_xoff;  the  numerics  with
-            width_status_line; and the strings with prtr_non.
- 
--       o   HP/UX -- Supports the  SVr1  subset,  plus  the  SVr[234]  numerics
--           num_labels,   label_height,  label_width,  plus  function  keys  11
--           through 63, plus plab_norm,  label_on,  and  label_off,  plus  some
-+       o   HP/UX  --  Supports  the  SVr1  subset,  plus the SVr[234] numerics
-+           num_labels,  label_height,  label_width,  plus  function  keys   11
-+           through  63,  plus  plab_norm,  label_on,  and label_off, plus some
-            incompatible extensions in the string table.
- 
--       o   AIX  -- Supports the SVr1 subset, plus function keys 11 through 63,
-+       o   AIX -- Supports the SVr1 subset, plus function keys 11 through  63,
-            plus a number of incompatible string table extensions.
- 
-        o   OSF -- Supports both the SVr4 set and the AIX extensions.
-@@ -2419,8 +2454,8 @@
- 
- 
-

    SEE ALSO

    --       tic(1m), infocmp(1m), curses(3x), curs_color(3x),  printf(3),  term(5).
--       term_variables(3x).  user_caps(5).
-+       tabs(1m),  tic(1m), infocmp(1m), curses(3x), curs_color(3x), curs_vari-
-+       ables(3x), printf(3), term(5).  term_variables(3x).  user_caps(5).
- 
- 
-

    AUTHORS

    -Index: doc/html/man/tic.1m.html
---- ncurses-6.1-20190609+/doc/html/man/tic.1m.html	2019-05-18 23:58:28.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/tic.1m.html	2019-06-15 23:31:12.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tic.1m,v 1.68 2019/05/18 21:59:56 tom Exp @
-+  * @Id: tic.1m,v 1.69 2019/05/18 22:48:40 tom Exp @
- -->
- 
- 
-@@ -365,7 +365,7 @@
-        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-        term(5).  terminfo(5).  user_caps(5).
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/toe.1m.html
---- ncurses-6.1-20190609+/doc/html/man/toe.1m.html	2019-05-18 23:58:28.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/toe.1m.html	2019-06-15 23:31:12.000000000 +0000
-@@ -113,7 +113,7 @@
-        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
-        minfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.1-20190609+/doc/html/man/tput.1.html	2019-05-18 23:58:28.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/tput.1.html	2019-06-15 23:31:12.000000000 +0000
-@@ -522,7 +522,7 @@
-

    SEE ALSO

    -        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.1-20190609+/doc/html/man/tset.1.html	2019-05-18 23:58:28.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/tset.1.html	2019-06-15 23:31:12.000000000 +0000
-@@ -389,7 +389,7 @@
-        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
-        ttys(5), environ(7)
- 
--       This describes ncurses version 6.1 (patch 20190518).
-+       This describes ncurses version 6.1 (patch 20190615).
- 
- 
- 
-Index: doc/html/man/user_caps.5.html
---- ncurses-6.1-20190609+/doc/html/man/user_caps.5.html	2019-05-18 23:58:28.000000000 +0000
-+++ ncurses-6.1-20190615/doc/html/man/user_caps.5.html	2019-06-15 23:31:12.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: man/tabs.1
-Prereq:  1.20 
---- ncurses-6.1-20190609+/man/tabs.1	2019-02-16 23:56:38.000000000 +0000
-+++ ncurses-6.1-20190615/man/tabs.1	2019-06-15 23:08:12.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tabs.1,v 1.20 2019/02/16 23:56:38 tom Exp $
-+.\" $Id: tabs.1,v 1.25 2019/06/15 23:08:12 tom Exp $
- .TH @TABS@ 1 ""
- .ds n 5
- .ie \n(.g .ds `` \(lq
-@@ -76,6 +76,15 @@
- in optimizing their output to the terminal.
- If the hardware tabstops differ from the information in the terminal
- database, the result is unpredictable.
-+Before running curses programs,
-+you should either reset tab-stops to the standard interval
-+.NS
-+tabs -8
-+.NE
-+.PP
-+or use the \fB@RESET@\fP program,
-+since the normal initialization sequences do not ensure that tab-stops
-+are reset.
- .SH OPTIONS
- .SS General Options
- .TP 5
-@@ -165,7 +174,10 @@
- However
- .bP
- This standard describes a \fB+m\fP option, to set a terminal's left-margin.
--Very few of the entries in the terminal database provide this capability.
-+Very few of the entries in the terminal database provide the
-+\fBsmgl\fP (\fBset_left_margin\fP) or
-+\fBsmglp\fP (\fBset_left_margin_parm\fP)
-+capability needed to support the feature.
- .bP
- There is no counterpart in X/Open Curses Issue 7 for this utility,
- unlike \fB@TPUT@(1)\fP.
-@@ -173,11 +185,44 @@
- The \fB\-d\fP (debug) and \fB\-n\fP (no-op) options are extensions not provided
- by other implementations.
- .PP
-+A \fBtabs\fP utility appeared in PWB/Unix 1.0 (1977),
-+and thereafter in 3BSD (1979).
-+It supported a single \*(``\-n\*('' option
-+(to cause the first tab stop to be set on the left margin).
-+That option is not documented by POSIX.
-+Initially, \fBtabs\fP used built-in tables rather than the terminal database,
-+to support a half-dozen terminal types.
-+It also had built-in logic to support the left-margin,
-+as well as a feature for copying the tab settings from a file.
-+.PP
-+Later versions of Unix, e.g., SVr4,
-+added support for the terminal database,
-+but kept the tables, as a fallback.
-+In an earlier development effort,
-+the tab-stop initialization provided by \fBtset\fP (1982)
-+and incorporated into \fBtput\fP uses the terminal database,
-+.PP
-+POSIX documents no limits on the number of tab stops.
- 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.
-+.PP
-+The \fIRationale\fP section of the POSIX documentation goes into some
-+detail about the ways the committee considered redesigning the
-+\fBtabs\fP and \fBtput\fP utilities,
-+without proposing an improved solution.
-+It comments that
-+.RS 5
-+.PP
-+no known historical version of tabs supports the capability of setting
-+arbitrary tab stops.
-+.RE
-+.PP
-+However, the \fIExplicit Lists\fP described in this manual page
-+were implemented in PWB/Unix.
-+Those provide the capability of setting abitrary tab stops.
- .SH SEE ALSO
- \fB@TSET@\fR(1),
- \fB@INFOCMP@\fR(1M),
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20190609+/package/debian-mingw/changelog	2019-06-09 20:06:01.000000000 +0000
-+++ ncurses-6.1-20190615/package/debian-mingw/changelog	2019-06-15 12:46:35.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190609) unstable; urgency=low
-+ncurses6 (6.1+20190615) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 09 Jun 2019 16:06:01 -0400
-+ -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20190609+/package/debian-mingw64/changelog	2019-06-09 20:06:01.000000000 +0000
-+++ ncurses-6.1-20190615/package/debian-mingw64/changelog	2019-06-15 12:46:35.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190609) unstable; urgency=low
-+ncurses6 (6.1+20190615) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 09 Jun 2019 16:06:01 -0400
-+ -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20190609+/package/debian/changelog	2019-06-09 20:06:01.000000000 +0000
-+++ ncurses-6.1-20190615/package/debian/changelog	2019-06-15 12:46:35.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190609) unstable; urgency=low
-+ncurses6 (6.1+20190615) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 09 Jun 2019 16:06:01 -0400
-+ -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.333 
---- ncurses-6.1-20190609+/package/mingw-ncurses.nsi	2019-06-09 20:06:01.000000000 +0000
-+++ ncurses-6.1-20190615/package/mingw-ncurses.nsi	2019-06-15 12:46:35.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.333 2019/06/09 20:06:01 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.334 2019/06/15 12:46:35 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "0609"
-+!define VERSION_MMDD  "0615"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20190609+/package/mingw-ncurses.spec	2019-06-09 20:06:01.000000000 +0000
-+++ ncurses-6.1-20190615/package/mingw-ncurses.spec	2019-06-15 12:46:35.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20190609
-+Release: 20190615
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20190609+/package/ncurses.spec	2019-06-09 20:06:01.000000000 +0000
-+++ ncurses-6.1-20190615/package/ncurses.spec	2019-06-15 12:46:35.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20190609
-+Release: 20190615
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20190609+/package/ncursest.spec	2019-06-09 20:06:01.000000000 +0000
-+++ ncurses-6.1-20190615/package/ncursest.spec	2019-06-15 12:46:35.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20190609
-+Release: 20190615
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20190623.patch b/ncurses-6.1-20190623.patch
deleted file mode 100644
index ab00b8e..0000000
--- a/ncurses-6.1-20190623.patch
+++ /dev/null
@@ -1,8026 +0,0 @@
-# ncurses 6.1 - patch 20190623 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190623.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jun 23 23:43:23 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                                  |   13 
-# VERSION                               |    2 
-# aclocal.m4                            |  224 ++-
-# config.guess                          |   89 -
-# config.sub                            |    9 
-# configure                             | 2322 +++++++++++++++++++-------------
-# configure.in                          |   12 
-# dist.mk                               |    4 
-# doc/html/man/adacurses6-config.1.html |    2 
-# doc/html/man/captoinfo.1m.html        |    2 
-# doc/html/man/clear.1.html             |    2 
-# doc/html/man/form.3x.html             |    2 
-# doc/html/man/infocmp.1m.html          |    2 
-# doc/html/man/infotocap.1m.html        |    2 
-# doc/html/man/menu.3x.html             |    2 
-# doc/html/man/ncurses.3x.html          |    2 
-# doc/html/man/ncurses6-config.1.html   |    2 
-# doc/html/man/panel.3x.html            |    2 
-# doc/html/man/tabs.1.html              |   36 
-# doc/html/man/terminfo.5.html          |    2 
-# doc/html/man/tic.1m.html              |    2 
-# doc/html/man/toe.1m.html              |    2 
-# doc/html/man/tput.1.html              |    2 
-# doc/html/man/tset.1.html              |    2 
-# include/nc_mingw.h                    |    6 
-# include/ncurses_defs                  |    3 
-# man/man_db.renames                    |    3 
-# man/tabs.1                            |   16 
-# ncurses/base/lib_initscr.c            |   21 
-# ncurses/curses.priv.h                 |    6 
-# ncurses/tinfo/lib_acs.c               |    4 
-# ncurses/tinfo/lib_setup.c             |   31 
-# ncurses/tty/tty_update.c              |    4 
-# package/debian-mingw/changelog        |    4 
-# package/debian-mingw64/changelog      |    4 
-# package/debian/changelog              |    4 
-# package/mingw-ncurses.nsi             |    4 
-# package/mingw-ncurses.spec            |    2 
-# package/ncurses.spec                  |    2 
-# package/ncursest.spec                 |    2 
-# test/test_sgr.c                       |   11 
-# 41 files changed, 1812 insertions(+), 1056 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3332 
---- ncurses-6.1-20190615+/NEWS	2019-06-15 23:39:53.000000000 +0000
-+++ ncurses-6.1-20190623/NEWS	2019-06-23 21:18:23.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3332 2019/06/15 23:39:53 tom Exp $
-+-- $Id: NEWS,v 1.3337 2019/06/23 21:18:23 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,17 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20190623
-+	+ improve the tabs.1 manual page to distinguish the PWB/Unix and 7th
-+	  Edition versions of the tabs utility.
-+	+ add configure check for getenv() to work around implementation shown
-+	  in Emscripten #6766, use that to optionally suppress START_TRACE
-+	  macro, whose call to getenv() may not work properly (report by Ilya
-+	  Ig Petrov).
-+	+ modify initialization functions to avoid relying upon persistent
-+	  data for the result from getenv().
-+	+ update config.guess, config.sub
-+
- 20190615
- 	+ expand the portability section of the man/tabs.1 manual page.
- 	+ regenerate HTML manpages.
-Index: VERSION
---- ncurses-6.1-20190615+/VERSION	2019-06-15 12:46:35.000000000 +0000
-+++ ncurses-6.1-20190623/VERSION	2019-06-23 15:31:40.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20190615
-+5:0:10	6.1	20190623
-Index: aclocal.m4
-Prereq:  1.862 
---- ncurses-6.1-20190615+/aclocal.m4	2019-03-30 21:53:01.000000000 +0000
-+++ ncurses-6.1-20190623/aclocal.m4	2019-06-23 19:53:31.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.862 2019/03/30 21:53:01 tom Exp $
-+dnl $Id: aclocal.m4,v 1.869 2019/06/23 19:53:31 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -925,6 +925,35 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_CHECK_ENVIRON version: 3 updated: 2010/05/26 16:44:57
-+dnl ----------------
-+dnl Check for data that is usually declared in , e.g., the 'environ'
-+dnl variable.  Define a DECL_xxx symbol if we must declare it ourselves.
-+dnl
-+dnl $1 = the name to check
-+dnl $2 = the assumed type
-+AC_DEFUN([CF_CHECK_ENVIRON],
-+[
-+AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
-+    AC_TRY_COMPILE([
-+#ifdef HAVE_STDLIB_H
-+#include 
-+#endif
-+#include  ],
-+    ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1,
-+    [cf_cv_dcl_$1=yes],
-+    [cf_cv_dcl_$1=no])
-+])
-+
-+if test "$cf_cv_dcl_$1" = no ; then
-+    CF_UPPER(cf_result,decl_$1)
-+    AC_DEFINE_UNQUOTED($cf_result)
-+fi
-+
-+# It's possible (for near-UNIX clones) that the data doesn't exist
-+CF_CHECK_EXTERN_DATA($1,ifelse([$2],,int,[$2]))
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_CHECK_ERRNO version: 12 updated: 2015/04/18 08:56:57
- dnl --------------
- dnl Check for data that is usually declared in  or , e.g.,
-@@ -982,6 +1011,132 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_CHECK_GETENV version: 1 updated: 2019/06/23 15:28:15
-+dnl ---------------
-+dnl Check if repeated getenv calls return the same pointer, e.g., it does not
-+dnl discard the previous pointer when returning a new one.
-+AC_DEFUN([CF_CHECK_GETENV],
-+[
-+AC_REQUIRE([CF_CHECK_ENVIRON])
-+AC_CHECK_FUNC( getenv, ,, AC_MSG_ERROR(getenv not found) )
-+AC_CHECK_FUNCS( putenv setenv strdup )
-+AC_CACHE_CHECK(if getenv returns consistent values,cf_cv_consistent_getenv,[
-+AC_TRY_RUN([
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+
-+#if defined(HAVE_ENVIRON) && defined(DECL_ENVIRON) && !defined(environ)
-+extern char **environ;	/* POSIX, but some systems are not... */
-+#endif
-+
-+#if defined(HAVE_STRDUP)
-+#define str_alloc(s) strdup(s)
-+#else
-+#define str_alloc(s) strcpy(malloc(strlen(s) + 1, s))
-+#endif
-+
-+static void set_value(const char *name, const char *value)
-+{
-+#if defined(HAVE_SETENV)
-+	setenv(name, value, 1);
-+#elif defined(HAVE_PUTENV)
-+	char buffer[1024];
-+	sprintf(buffer, "%s=%s", name, value);
-+	putenv(str_alloc(buffer));
-+#else
-+#error neither putenv/setenv found
-+#endif
-+}
-+int main(void)
-+{
-+	int pass;
-+	size_t numenv, limit, j;
-+	char **mynames;
-+	char **myvalues;
-+	char **mypointer;
-+	char *equals;
-+	for (numenv = 0; environ[numenv]; ++numenv) ;
-+	limit = numenv + 10;
-+	mynames = (char **) calloc(limit + 1, sizeof(char *));
-+	myvalues = (char **) calloc(limit + 1, sizeof(char *));
-+	mypointer = (char **) calloc(limit + 1, sizeof(char *));
-+#if defined(HAVE_ENVIRON)
-+	for (j = 0; environ[j]; ++j) {
-+		mynames[j] = str_alloc(environ[j]);
-+		equals = strchr(mynames[j], '=');
-+		if (equals != 0) {
-+			*equals++ = '\0';
-+			myvalues[j] = str_alloc(equals);
-+		} else {
-+			myvalues[j] = str_alloc("");
-+		}
-+	}
-+#endif
-+	for (j = numenv; j < limit; ++j) {
-+		char name[80];
-+		char value[80];
-+		size_t found;
-+		size_t k = 0;
-+		do {
-+			size_t jk;
-+			found = 0;
-+			sprintf(name, "TERM%lu", (unsigned long) k);
-+			for (jk = 0; jk < j; ++jk) {
-+				if (!strcmp(name, mynames[jk])) {
-+					found = 1;
-+					++k;
-+					break;
-+				}
-+			}
-+		} while (found);
-+		sprintf(value, "%lu:%p", (unsigned long) k, &mynames[j]);
-+		set_value(name, value);
-+		mynames[j] = str_alloc(name);
-+		myvalues[j] = str_alloc(value);
-+	}
-+	for (pass = 0; pass < 3; ++pass) {
-+		for (j = 0; j < limit; ++j) {
-+			char *value = getenv(mynames[j]);
-+			if (pass) {
-+				if (value == 0) {
-+					fprintf(stderr, "getenv returned null for %s\n", mynames[j]);
-+					${cf_cv_main_return:-return}(1);
-+				} else if (value != mypointer[j]) {
-+					fprintf(stderr, "getenv returned different pointer for %s\n", mynames[j]);
-+					${cf_cv_main_return:-return}(1);
-+				} else if (strcmp(value, myvalues[j])) {
-+					fprintf(stderr, "getenv returned different value for %s\n", mynames[j]);
-+					${cf_cv_main_return:-return}(1);
-+				}
-+			} else {
-+				size_t k;
-+				mypointer[j] = value;
-+				for (k = 0; k < j; ++k) {
-+					if (mypointer[j] == mypointer[k]) {
-+						fprintf(stderr, "getenv returned same pointer for %s and %s\n", mynames[j], mynames[k]);
-+						${cf_cv_main_return:-return}(1);
-+					}
-+				}
-+			}
-+		}
-+	}
-+	${cf_cv_main_return:-return}(0);
-+}
-+],
-+[cf_cv_consistent_getenv=yes],
-+[cf_cv_consistent_getenv=no],
-+[cf_cv_consistent_getenv=unknown])
-+])
-+
-+if test "x$cf_cv_consistent_getenv" = xno
-+then
-+	AC_DEFINE(HAVE_CONSISTENT_GETENV,1,[Define to 1 if getenv repeatably returns the same value for a given name])
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_CHECK_GPM_WGETCH version: 3 updated: 2017/01/21 11:06:25
- dnl -------------------
- dnl Check if GPM is already linked with curses.  If so - and if the linkage
-@@ -1253,6 +1408,60 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
-+dnl CF_CONST_X_STRING version: 1 updated: 2019/04/08 17:50:29
-+dnl -----------------
-+dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
-+dnl character-strings.
-+dnl
-+dnl It is ambiguous because the specification accommodated the pre-ANSI
-+dnl compilers bundled by more than one vendor in lieu of providing a standard C
-+dnl compiler other than by costly add-ons.  Because of this, the specification
-+dnl did not take into account the use of const for telling the compiler that
-+dnl string literals would be in readonly memory.
-+dnl
-+dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
-+dnl let the compiler decide how to represent Xt's strings which were #define'd. 
-+dnl That does not solve the problem of using the block of Xt's strings which
-+dnl are compiled into the library (and is less efficient than one might want).
-+dnl
-+dnl Xt specification 7 introduces the _CONST_X_STRING symbol which is used both
-+dnl when compiling the library and compiling using the library, to tell the
-+dnl compiler that String is const.
-+AC_DEFUN([CF_CONST_X_STRING],
-+[
-+AC_TRY_COMPILE(
-+[
-+#include 
-+#include 
-+],
-+[String foo = malloc(1)],[
-+
-+AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
-+	AC_TRY_COMPILE(
-+		[
-+#define _CONST_X_STRING	/* X11R7.8 (perhaps) */
-+#undef  XTSTRINGDEFINES	/* X11R5 and later */
-+#include 
-+#include 
-+		],[String foo = malloc(1); *foo = 0],[
-+			cf_cv_const_x_string=no
-+		],[
-+			cf_cv_const_x_string=yes
-+		])
-+])
-+
-+case $cf_cv_const_x_string in
-+(no)
-+	CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
-+	;;
-+(*)
-+	CF_APPEND_TEXT(CPPFLAGS,-D_CONST_X_STRING)
-+	;;
-+esac
-+
-+])
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_CPP_PARAM_INIT version: 7 updated: 2017/01/21 11:06:25
- dnl -----------------
- dnl Check if the C++ compiler accepts duplicate parameter initialization.  This
-@@ -2343,7 +2552,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_GCC_WARNINGS version: 33 updated: 2018/06/20 20:23:13
-+dnl CF_GCC_WARNINGS version: 35 updated: 2019/06/16 09:45:01
- dnl ---------------
- dnl Check if the compiler supports useful warning options.  There's a few that
- dnl we don't use, simply because they're too noisy:
-@@ -2367,12 +2576,11 @@
- AC_REQUIRE([CF_GCC_VERSION])
- CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
- CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
--
-+if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
- cat > conftest.$ac_ext < /dev/null 2> /dev/null && \
-+		! xcode-select --print-path > /dev/null 2> /dev/null ; then
-+	    # Avoid executing cc if there is no toolchain installed as
-+	    # cc will be a stub that puts up a graphical alert
-+	    # prompting the user to install developer tools.
-+	    CC_FOR_BUILD=no_compiler_found
-+	else
-+	    set_cc_for_build
- 	fi
--	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
--	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
--		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
--		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
--		       grep IS_64BIT_ARCH >/dev/null
--		then
--		    case $UNAME_PROCESSOR in
--			i386) UNAME_PROCESSOR=x86_64 ;;
--			powerpc) UNAME_PROCESSOR=powerpc64 ;;
--		    esac
--		fi
--		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
--		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
--		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
--		       grep IS_PPC >/dev/null
--		then
--		    UNAME_PROCESSOR=powerpc
--		fi
-+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		   grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		case $UNAME_PROCESSOR in
-+		    i386) UNAME_PROCESSOR=x86_64 ;;
-+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
-+		esac
-+	    fi
-+	    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-+	    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		   grep IS_PPC >/dev/null
-+	    then
-+		UNAME_PROCESSOR=powerpc
- 	    fi
- 	elif test "$UNAME_PROCESSOR" = i386 ; then
--	    # Avoid executing cc on OS X 10.9, as it ships with a stub
--	    # that puts up a graphical alert prompting to install
--	    # developer tools.  Any system running Mac OS X 10.7 or
--	    # later (Darwin 11 and later) is required to have a 64-bit
--	    # processor. This is not true of the ARM version of Darwin
--	    # that Apple uses in portable devices.
--	    UNAME_PROCESSOR=x86_64
-+	    # uname -m returns i386 or x86_64
-+	    UNAME_PROCESSOR=$UNAME_MACHINE
- 	fi
- 	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
- 	exit ;;
-@@ -1468,6 +1472,14 @@
- #include 
- #include 
- #endif
-+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
-+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-+#include 
-+#if defined(_SIZE_T_) || defined(SIGLOST)
-+#include 
-+#endif
-+#endif
-+#endif
- main ()
- {
- #if defined (sony)
-@@ -1555,18 +1567,23 @@
-   printf ("vax-dec-bsd\n"); exit (0);
- #endif
- #else
-+#if defined(_SIZE_T_) || defined(SIGLOST)
-+  struct utsname un;
-+  uname (&un);
-+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
-+#else
-   printf ("vax-dec-ultrix\n"); exit (0);
- #endif
- #endif
-+#endif
- #if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
- #if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
--#include 
--#if defined(_SIZE_T_) /* >= ULTRIX4 */
--  printf ("mips-dec-ultrix4\n"); exit (0);
-+#if defined(_SIZE_T_) || defined(SIGLOST)
-+  struct utsname *un;
-+  uname (&un);
-+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
- #else
--#if defined(ULTRIX3) || defined(ultrix3) || defined(SIGLOST)
--  printf ("mips-dec-ultrix3\n"); exit (0);
--#endif
-+  printf ("mips-dec-ultrix\n"); exit (0);
- #endif
- #endif
- #endif
-Index: config.sub
---- ncurses-6.1-20190615+/config.sub	2019-03-28 21:31:13.000000000 +0000
-+++ ncurses-6.1-20190623/config.sub	2019-05-23 01:27:51.000000000 +0000
-@@ -2,7 +2,7 @@
- # Configuration validation subroutine script.
- #   Copyright 1992-2019 Free Software Foundation, Inc.
- 
--timestamp='2019-01-05'
-+timestamp='2019-05-23'
- 
- # 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
-@@ -1172,7 +1172,7 @@
- 			| asmjs \
- 			| ba \
- 			| be32 | be64 \
--			| bfin | bs2000 \
-+			| bfin | bpf | bs2000 \
- 			| c[123]* | c30 | [cjt]90 | c4x \
- 			| c8051 | clipper | craynv | csky | cydra \
- 			| d10v | d30v | dlx | dsp16xx \
-@@ -1247,7 +1247,8 @@
- 			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
- 			| vax \
- 			| visium \
--			| w65 | wasm32 \
-+			| w65 \
-+			| wasm32 | wasm64 \
- 			| we32k \
- 			| x86 | x86_64 | xc16x | xgate | xps100 \
- 			| xstormy16 | xtensa* \
-@@ -1367,7 +1368,7 @@
- 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
- 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
--	     | midnightbsd* | amdhsa* | unleashed* | emscripten*)
-+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	qnx*)
-Index: configure
---- ncurses-6.1-20190615+/configure	2019-03-30 21:50:56.000000000 +0000
-+++ ncurses-6.1-20190623/configure	2019-06-23 21:27:11.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.678 .
-+# From configure.in Revision: 1.682 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20181006.
- #
-@@ -15116,11 +15116,111 @@
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
-+if test "x$have_x" = xyes; then
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 15121 "configure"
-+#include "confdefs.h"
-+
-+#include 
-+#include 
-+
-+int
-+main (void)
-+{
-+String foo = malloc(1)
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:15139: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:15145: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+
-+echo "$as_me:15148: checking for X11/Xt const-feature" >&5
-+echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
-+if test "${cf_cv_const_x_string+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 15155 "configure"
-+#include "confdefs.h"
-+
-+#define _CONST_X_STRING	/* X11R7.8 (perhaps) */
-+#undef  XTSTRINGDEFINES	/* X11R5 and later */
-+#include 
-+#include 
-+
-+int
-+main (void)
-+{
-+String foo = malloc(1); *foo = 0
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:15172: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:15175: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:15181: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+
-+			cf_cv_const_x_string=no
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+
-+			cf_cv_const_x_string=yes
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:15196: result: $cf_cv_const_x_string" >&5
-+echo "${ECHO_T}$cf_cv_const_x_string" >&6
-+
-+case $cf_cv_const_x_string in
-+(no)
-+
-+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
-+	CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES"
-+
-+	;;
-+(*)
-+
-+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
-+	CPPFLAGS="${CPPFLAGS}-D_CONST_X_STRING"
-+
-+	;;
-+esac
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:15237: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -15150,21 +15250,20 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:15153: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:15253: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15156: \$? = $ac_status" >&5
-+  echo "$as_me:15256: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:15158: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:15258: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
- 	done
- 	CFLAGS="$cf_save_CFLAGS"
--
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:15167: checking for $CC warning options..." >&5
-+	{ echo "$as_me:15266: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -15188,26 +15287,20 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:15191: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:15290: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15194: \$? = $ac_status" >&5
-+  echo "$as_me:15293: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:15196: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:15295: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
--			(Wcast-qual)
--
--	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
--	CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES"
--
--				;;
- 			(Winline)
- 				case $GCC_VERSION in
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:15210: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:15303: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -15217,7 +15310,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:15220: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:15313: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -15237,12 +15330,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:15240: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:15333: 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 15245 "configure"
-+#line 15338 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15259,16 +15352,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15262: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15355: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15265: \$? = $ac_status" >&5
-+  echo "$as_me:15358: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15268: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15361: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15271: \$? = $ac_status" >&5
-+  echo "$as_me:15364: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -15279,7 +15372,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:15282: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:15375: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -15288,12 +15381,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:15291: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:15384: checking if this is really Clang C++ compiler" >&5
- echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CXXFLAGS"
- 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15296 "configure"
-+#line 15389 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15310,16 +15403,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15313: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15406: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15316: \$? = $ac_status" >&5
-+  echo "$as_me:15409: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15319: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15412: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15322: \$? = $ac_status" >&5
-+  echo "$as_me:15415: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -15330,7 +15423,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:15333: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:15426: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -15342,7 +15435,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:15456: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -15377,12 +15470,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:15380: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:15473: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15383: \$? = $ac_status" >&5
-+  echo "$as_me:15476: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:15385: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:15478: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -15391,7 +15484,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:15394: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:15487: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -15421,16 +15514,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:15424: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:15517: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15427: \$? = $ac_status" >&5
-+  echo "$as_me:15520: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:15429: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:15522: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:15433: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:15526: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -15466,10 +15559,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:15469: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:15562: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:15614: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15524: \$? = $ac_status" >&5
-+  echo "$as_me:15617: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:15526: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:15619: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -15582,7 +15675,7 @@
- rm -rf conftest*
- fi
- 
--echo "$as_me:15585: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:15678: checking if you want to work around bogus compiler/loader warnings" >&5
- echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
- 
- # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -15592,7 +15685,7 @@
- else
-   with_string_hacks=no
- fi;
--echo "$as_me:15595: result: $with_string_hacks" >&5
-+echo "$as_me:15688: result: $with_string_hacks" >&5
- echo "${ECHO_T}$with_string_hacks" >&6
- 
- if test "x$with_string_hacks" = "xyes"; then
-@@ -15601,15 +15694,15 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ echo "$as_me:15604: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:15697: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
- echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
--	echo "$as_me:15606: checking for strlcat" >&5
-+	echo "$as_me:15699: checking for strlcat" >&5
- echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
- if test "${ac_cv_func_strlcat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15612 "configure"
-+#line 15705 "configure"
- #include "confdefs.h"
- #define strlcat autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -15640,16 +15733,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15643: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15736: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15646: \$? = $ac_status" >&5
-+  echo "$as_me:15739: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15649: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15742: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15652: \$? = $ac_status" >&5
-+  echo "$as_me:15745: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_strlcat=yes
- else
-@@ -15659,7 +15752,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15662: result: $ac_cv_func_strlcat" >&5
-+echo "$as_me:15755: result: $ac_cv_func_strlcat" >&5
- echo "${ECHO_T}$ac_cv_func_strlcat" >&6
- if test $ac_cv_func_strlcat = yes; then
- 
-@@ -15669,7 +15762,7 @@
- 
- else
- 
--		echo "$as_me:15672: checking for strlcat in -lbsd" >&5
-+		echo "$as_me:15765: checking for strlcat in -lbsd" >&5
- echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15677,7 +15770,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15680 "configure"
-+#line 15773 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15696,16 +15789,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15699: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15792: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15702: \$? = $ac_status" >&5
-+  echo "$as_me:15795: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15705: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15798: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15708: \$? = $ac_status" >&5
-+  echo "$as_me:15801: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_strlcat=yes
- else
-@@ -15716,7 +15809,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15719: result: $ac_cv_lib_bsd_strlcat" >&5
-+echo "$as_me:15812: result: $ac_cv_lib_bsd_strlcat" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
- if test $ac_cv_lib_bsd_strlcat = yes; then
- 
-@@ -15739,23 +15832,23 @@
- for ac_header in bsd/string.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15742: checking for $ac_header" >&5
-+echo "$as_me:15835: 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 15748 "configure"
-+#line 15841 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15752: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15845: \"$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:15758: \$? = $ac_status" >&5
-+  echo "$as_me:15851: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15774,7 +15867,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15777: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15870: 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 <&5
-+echo "$as_me:15891: 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 15804 "configure"
-+#line 15897 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -15832,16 +15925,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15835: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15928: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15838: \$? = $ac_status" >&5
-+  echo "$as_me:15931: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15841: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15934: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15844: \$? = $ac_status" >&5
-+  echo "$as_me:15937: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -15851,7 +15944,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15854: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:15947: 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 <&5
-+echo "$as_me:15960: 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.
-@@ -15874,7 +15967,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:15877: result: $with_assertions" >&5
-+echo "$as_me:15970: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -15890,7 +15983,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:15893: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:15986: 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.
-@@ -15907,7 +16000,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:15910: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:16003: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -16021,23 +16114,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:16024: checking for dmalloc.h" >&5
-+	echo "$as_me:16117: 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 16030 "configure"
-+#line 16123 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:16034: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16127: \"$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:16040: \$? = $ac_status" >&5
-+  echo "$as_me:16133: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16056,11 +16149,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16059: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:16152: 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:16063: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:16156: 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
-@@ -16068,7 +16161,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16071 "configure"
-+#line 16164 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16087,16 +16180,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16090: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16183: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16093: \$? = $ac_status" >&5
-+  echo "$as_me:16186: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16096: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16189: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16099: \$? = $ac_status" >&5
-+  echo "$as_me:16192: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -16107,7 +16200,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16110: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:16203: 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 <&5
-+echo "$as_me:16218: 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.
-@@ -16139,7 +16232,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:16142: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:16235: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -16253,23 +16346,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:16256: checking for dbmalloc.h" >&5
-+	echo "$as_me:16349: 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 16262 "configure"
-+#line 16355 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:16266: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16359: \"$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:16272: \$? = $ac_status" >&5
-+  echo "$as_me:16365: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16288,11 +16381,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16291: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:16384: 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:16295: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:16388: 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
-@@ -16300,7 +16393,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16303 "configure"
-+#line 16396 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16319,16 +16412,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16322: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16415: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16325: \$? = $ac_status" >&5
-+  echo "$as_me:16418: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16328: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16331: \$? = $ac_status" >&5
-+  echo "$as_me:16424: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -16339,7 +16432,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16342: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:16435: 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 <&5
-+echo "$as_me:16450: 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.
-@@ -16371,7 +16464,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:16374: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:16467: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -16484,7 +16577,7 @@
- 	;;
- esac
- 
--echo "$as_me:16487: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:16580: 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.
-@@ -16494,7 +16587,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:16497: result: $with_no_leaks" >&5
-+echo "$as_me:16590: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -16546,7 +16639,7 @@
- 	;;
- esac
- 
--echo "$as_me:16549: checking whether to add trace feature to all models" >&5
-+echo "$as_me:16642: 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.
-@@ -16556,7 +16649,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:16559: result: $cf_with_trace" >&5
-+echo "$as_me:16652: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "x$cf_with_trace" = xyes ; then
-@@ -16670,7 +16763,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:16673: checking if we want to use GNAT projects" >&5
-+echo "$as_me:16766: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -16687,7 +16780,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:16690: result: $enable_gnat_projects" >&5
-+echo "$as_me:16783: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -16697,13 +16790,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--echo "$as_me:16700: checking for gettimeofday" >&5
-+echo "$as_me:16793: 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 16706 "configure"
-+#line 16799 "configure"
- #include "confdefs.h"
- #define gettimeofday autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -16734,16 +16827,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16737: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16830: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16740: \$? = $ac_status" >&5
-+  echo "$as_me:16833: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16743: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16836: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16746: \$? = $ac_status" >&5
-+  echo "$as_me:16839: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -16753,7 +16846,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16756: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:16849: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
- 
-@@ -16763,7 +16856,7 @@
- 
- else
- 
--echo "$as_me:16766: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:16859: 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
-@@ -16771,7 +16864,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16774 "configure"
-+#line 16867 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16790,16 +16883,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16793: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16796: \$? = $ac_status" >&5
-+  echo "$as_me:16889: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16799: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16892: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16802: \$? = $ac_status" >&5
-+  echo "$as_me:16895: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -16810,7 +16903,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16813: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:16906: 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
- 
-@@ -16840,14 +16933,14 @@
- 	;;
- esac
- 
--echo "$as_me:16843: checking if -lm needed for math functions" >&5
-+echo "$as_me:16936: 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 16850 "configure"
-+#line 16943 "configure"
- #include "confdefs.h"
- 
- 	#include 
-@@ -16863,16 +16956,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16866: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16959: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16869: \$? = $ac_status" >&5
-+  echo "$as_me:16962: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16872: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16965: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16875: \$? = $ac_status" >&5
-+  echo "$as_me:16968: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -16882,7 +16975,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16885: result: $cf_cv_need_libm" >&5
-+echo "$as_me:16978: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -16890,13 +16983,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:16893: checking for ANSI C header files" >&5
-+echo "$as_me:16986: 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 16899 "configure"
-+#line 16992 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -16904,13 +16997,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:16907: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17000: \"$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:16913: \$? = $ac_status" >&5
-+  echo "$as_me:17006: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16932,7 +17025,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 16935 "configure"
-+#line 17028 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -16950,7 +17043,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 16953 "configure"
-+#line 17046 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -16971,7 +17064,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16974 "configure"
-+#line 17067 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -16997,15 +17090,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17000: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17093: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17003: \$? = $ac_status" >&5
-+  echo "$as_me:17096: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17005: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17008: \$? = $ac_status" >&5
-+  echo "$as_me:17101: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -17018,7 +17111,7 @@
- fi
- fi
- fi
--echo "$as_me:17021: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:17114: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -17031,13 +17124,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:17034: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:17127: 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 17040 "configure"
-+#line 17133 "configure"
- #include "confdefs.h"
- #include 
- #include <$ac_hdr>
-@@ -17052,16 +17145,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17055: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17148: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17058: \$? = $ac_status" >&5
-+  echo "$as_me:17151: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17064: \$? = $ac_status" >&5
-+  echo "$as_me:17157: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -17071,7 +17164,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17074: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:17167: 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 <&5
-+  echo "$as_me:17180: 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
-@@ -17092,7 +17185,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17095 "configure"
-+#line 17188 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17111,16 +17204,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17114: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17207: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17117: \$? = $ac_status" >&5
-+  echo "$as_me:17210: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17120: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17213: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17123: \$? = $ac_status" >&5
-+  echo "$as_me:17216: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -17131,14 +17224,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17134: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:17227: 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:17141: checking for opendir in -lx" >&5
-+  echo "$as_me:17234: 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
-@@ -17146,7 +17239,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17149 "configure"
-+#line 17242 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17165,16 +17258,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17168: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17261: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17171: \$? = $ac_status" >&5
-+  echo "$as_me:17264: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17174: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17177: \$? = $ac_status" >&5
-+  echo "$as_me:17270: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -17185,7 +17278,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17188: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:17281: 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"
-@@ -17193,13 +17286,13 @@
- 
- fi
- 
--echo "$as_me:17196: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:17289: 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 17202 "configure"
-+#line 17295 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -17215,16 +17308,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17218: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17311: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17221: \$? = $ac_status" >&5
-+  echo "$as_me:17314: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17224: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17317: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17227: \$? = $ac_status" >&5
-+  echo "$as_me:17320: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -17234,7 +17327,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17237: result: $ac_cv_header_time" >&5
-+echo "$as_me:17330: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -17253,13 +17346,13 @@
- 	;;
- esac
- 
--echo "$as_me:17256: checking for regcomp" >&5
-+echo "$as_me:17349: checking for regcomp" >&5
- echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
- if test "${ac_cv_func_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17262 "configure"
-+#line 17355 "configure"
- #include "confdefs.h"
- #define regcomp autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -17290,16 +17383,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17293: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17386: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17296: \$? = $ac_status" >&5
-+  echo "$as_me:17389: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17299: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17392: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17302: \$? = $ac_status" >&5
-+  echo "$as_me:17395: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -17309,7 +17402,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17312: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:17405: result: $ac_cv_func_regcomp" >&5
- echo "${ECHO_T}$ac_cv_func_regcomp" >&6
- if test $ac_cv_func_regcomp = yes; then
-   cf_regex_func=regcomp
-@@ -17318,7 +17411,7 @@
- 	for cf_regex_lib in $cf_regex_libs
- 	do
- 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:17321: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:17414: checking for regcomp in -l$cf_regex_lib" >&5
- echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17326,7 +17419,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17329 "configure"
-+#line 17422 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17345,16 +17438,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17348: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17441: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17351: \$? = $ac_status" >&5
-+  echo "$as_me:17444: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17354: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17447: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17357: \$? = $ac_status" >&5
-+  echo "$as_me:17450: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -17365,7 +17458,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17368: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:17461: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -17394,13 +17487,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:17397: checking for compile" >&5
-+	echo "$as_me:17490: checking for compile" >&5
- echo $ECHO_N "checking for compile... $ECHO_C" >&6
- if test "${ac_cv_func_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17403 "configure"
-+#line 17496 "configure"
- #include "confdefs.h"
- #define compile autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -17431,16 +17524,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17434: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17527: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17437: \$? = $ac_status" >&5
-+  echo "$as_me:17530: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17440: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17533: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17443: \$? = $ac_status" >&5
-+  echo "$as_me:17536: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -17450,13 +17543,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17453: result: $ac_cv_func_compile" >&5
-+echo "$as_me:17546: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:17459: checking for compile in -lgen" >&5
-+		echo "$as_me:17552: checking for compile in -lgen" >&5
- echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17464,7 +17557,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17467 "configure"
-+#line 17560 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17483,16 +17576,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17486: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17579: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17489: \$? = $ac_status" >&5
-+  echo "$as_me:17582: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17492: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17585: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17495: \$? = $ac_status" >&5
-+  echo "$as_me:17588: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -17503,7 +17596,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17506: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:17599: result: $ac_cv_lib_gen_compile" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
-@@ -17531,11 +17624,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:17534: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:17627: WARNING: cannot find regular expression library" >&5
- echo "$as_me: WARNING: cannot find regular expression library" >&2;}
- fi
- 
--echo "$as_me:17538: checking for regular-expression headers" >&5
-+echo "$as_me:17631: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex_hdrs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17547,7 +17640,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 17550 "configure"
-+#line 17643 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -17562,16 +17655,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17565: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17658: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17568: \$? = $ac_status" >&5
-+  echo "$as_me:17661: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17571: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17664: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17574: \$? = $ac_status" >&5
-+  echo "$as_me:17667: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -17588,7 +17681,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 17591 "configure"
-+#line 17684 "configure"
- #include "confdefs.h"
- #include 
- #include <$cf_regex_hdr>
-@@ -17606,16 +17699,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17609: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17702: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17612: \$? = $ac_status" >&5
-+  echo "$as_me:17705: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17615: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17708: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17618: \$? = $ac_status" >&5
-+  echo "$as_me:17711: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -17631,11 +17724,11 @@
- esac
- 
- fi
--echo "$as_me:17634: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:17727: result: $cf_cv_regex_hdrs" >&5
- echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
- 
- case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:17638: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:17731: WARNING: no regular expression header found" >&5
- echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
- 	(regex.h)
- cat >>confdefs.h <<\EOF
-@@ -17674,23 +17767,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:17677: checking for $ac_header" >&5
-+echo "$as_me:17770: 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 17683 "configure"
-+#line 17776 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:17687: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17780: \"$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:17693: \$? = $ac_status" >&5
-+  echo "$as_me:17786: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -17709,7 +17802,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:17712: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:17805: 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 <&5
-+echo "$as_me:17818: 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 17731 "configure"
-+#line 17824 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:17735: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17828: \"$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:17741: \$? = $ac_status" >&5
-+  echo "$as_me:17834: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -17757,7 +17850,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:17760: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:17853: 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 <&5
-+echo "$as_me:17863: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17777,7 +17870,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 17780 "configure"
-+#line 17873 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -17790,16 +17883,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17793: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17886: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17796: \$? = $ac_status" >&5
-+  echo "$as_me:17889: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17799: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17892: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17802: \$? = $ac_status" >&5
-+  echo "$as_me:17895: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -17811,7 +17904,7 @@
- done
- 
- fi
--echo "$as_me:17814: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:17907: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -17828,11 +17921,411 @@
- 
- fi
- 
-+echo "$as_me:17924: checking if external environ is declared" >&5
-+echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
-+if test "${cf_cv_dcl_environ+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line 17931 "configure"
-+#include "confdefs.h"
-+
-+#ifdef HAVE_STDLIB_H
-+#include 
-+#endif
-+#include 
-+int
-+main (void)
-+{
-+int x = (int) environ
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:17947: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:17950: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:17953: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:17956: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_dcl_environ=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_dcl_environ=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:17967: result: $cf_cv_dcl_environ" >&5
-+echo "${ECHO_T}$cf_cv_dcl_environ" >&6
-+
-+if test "$cf_cv_dcl_environ" = no ; then
-+
-+cf_result=`echo "decl_environ" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-+
-+    cat >>confdefs.h <&5
-+echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
-+if test "${cf_cv_have_environ+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 17989 "configure"
-+#include "confdefs.h"
-+
-+#undef environ
-+extern int environ;
-+
-+int
-+main (void)
-+{
-+environ = 2
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:18004: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:18007: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:18010: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:18013: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_have_environ=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_have_environ=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:18024: result: $cf_cv_have_environ" >&5
-+echo "${ECHO_T}$cf_cv_have_environ" >&6
-+
-+if test "$cf_cv_have_environ" = yes ; then
-+
-+cf_result=`echo "have_environ" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-+
-+	cat >>confdefs.h <&5
-+echo $ECHO_N "checking for getenv... $ECHO_C" >&6
-+if test "${ac_cv_func_getenv+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 18043 "configure"
-+#include "confdefs.h"
-+#define getenv autoconf_temporary
-+#include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-+#undef getenv
-+
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char getenv (void);
-+
-+int
-+main (void)
-+{
-+
-+/* The GNU C library defines stubs for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_getenv) || defined (__stub___getenv)
-+#error found stub for getenv
-+#endif
-+
-+	return getenv ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:18074: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:18077: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:18080: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:18083: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_func_getenv=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_func_getenv=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:18093: result: $ac_cv_func_getenv" >&5
-+echo "${ECHO_T}$ac_cv_func_getenv" >&6
-+
-+for ac_func in putenv setenv strdup
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:18099: 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 18105 "configure"
-+#include "confdefs.h"
-+#define $ac_func autoconf_temporary
-+#include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-+#undef $ac_func
-+
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char $ac_func (void);
-+
-+int
-+main (void)
-+{
-+
-+/* The GNU C library defines stubs for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#error found stub for $ac_func
-+#endif
-+
-+	return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:18136: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:18139: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:18142: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:18145: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:18155: 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 <&5
-+echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
-+if test "${cf_cv_consistent_getenv+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "$cross_compiling" = yes; then
-+  cf_cv_consistent_getenv=unknown
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 18175 "configure"
-+#include "confdefs.h"
-+
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+
-+#if defined(HAVE_ENVIRON) && defined(DECL_ENVIRON) && !defined(environ)
-+extern char **environ;	/* POSIX, but some systems are not... */
-+#endif
-+
-+#if defined(HAVE_STRDUP)
-+#define str_alloc(s) strdup(s)
-+#else
-+#define str_alloc(s) strcpy(malloc(strlen(s) + 1, s))
-+#endif
-+
-+static void set_value(const char *name, const char *value)
-+{
-+#if defined(HAVE_SETENV)
-+	setenv(name, value, 1);
-+#elif defined(HAVE_PUTENV)
-+	char buffer[1024];
-+	sprintf(buffer, "%s=%s", name, value);
-+	putenv(str_alloc(buffer));
-+#else
-+#error neither putenv/setenv found
-+#endif
-+}
-+int main(void)
-+{
-+	int pass;
-+	size_t numenv, limit, j;
-+	char **mynames;
-+	char **myvalues;
-+	char **mypointer;
-+	char *equals;
-+	for (numenv = 0; environ[numenv]; ++numenv) ;
-+	limit = numenv + 10;
-+	mynames = (char **) calloc(limit + 1, sizeof(char *));
-+	myvalues = (char **) calloc(limit + 1, sizeof(char *));
-+	mypointer = (char **) calloc(limit + 1, sizeof(char *));
-+#if defined(HAVE_ENVIRON)
-+	for (j = 0; environ[j]; ++j) {
-+		mynames[j] = str_alloc(environ[j]);
-+		equals = strchr(mynames[j], '=');
-+		if (equals != 0) {
-+			*equals++ = '\0';
-+			myvalues[j] = str_alloc(equals);
-+		} else {
-+			myvalues[j] = str_alloc("");
-+		}
-+	}
-+#endif
-+	for (j = numenv; j < limit; ++j) {
-+		char name[80];
-+		char value[80];
-+		size_t found;
-+		size_t k = 0;
-+		do {
-+			size_t jk;
-+			found = 0;
-+			sprintf(name, "TERM%lu", (unsigned long) k);
-+			for (jk = 0; jk < j; ++jk) {
-+				if (!strcmp(name, mynames[jk])) {
-+					found = 1;
-+					++k;
-+					break;
-+				}
-+			}
-+		} while (found);
-+		sprintf(value, "%lu:%p", (unsigned long) k, &mynames[j]);
-+		set_value(name, value);
-+		mynames[j] = str_alloc(name);
-+		myvalues[j] = str_alloc(value);
-+	}
-+	for (pass = 0; pass < 3; ++pass) {
-+		for (j = 0; j < limit; ++j) {
-+			char *value = getenv(mynames[j]);
-+			if (pass) {
-+				if (value == 0) {
-+					fprintf(stderr, "getenv returned null for %s\n", mynames[j]);
-+					${cf_cv_main_return:-return}(1);
-+				} else if (value != mypointer[j]) {
-+					fprintf(stderr, "getenv returned different pointer for %s\n", mynames[j]);
-+					${cf_cv_main_return:-return}(1);
-+				} else if (strcmp(value, myvalues[j])) {
-+					fprintf(stderr, "getenv returned different value for %s\n", mynames[j]);
-+					${cf_cv_main_return:-return}(1);
-+				}
-+			} else {
-+				size_t k;
-+				mypointer[j] = value;
-+				for (k = 0; k < j; ++k) {
-+					if (mypointer[j] == mypointer[k]) {
-+						fprintf(stderr, "getenv returned same pointer for %s and %s\n", mynames[j], mynames[k]);
-+						${cf_cv_main_return:-return}(1);
-+					}
-+				}
-+			}
-+		}
-+	}
-+	${cf_cv_main_return:-return}(0);
-+}
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:18284: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:18287: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:18289: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:18292: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_consistent_getenv=yes
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_consistent_getenv=no
-+fi
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+fi
-+echo "$as_me:18305: result: $cf_cv_consistent_getenv" >&5
-+echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
-+
-+if test "x$cf_cv_consistent_getenv" = xno
-+then
-+
-+cat >>confdefs.h <<\EOF
-+#define HAVE_CONSISTENT_GETENV 1
-+EOF
-+
-+fi
-+
-+if test "x$cf_cv_consistent_getenv" = xno && \
-+	test "x$cf_with_trace" = xyes
-+then
-+	{ echo "$as_me:18320: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
-+echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
-+fi
-+
- # check for ISC (this may also define _POSIX_SOURCE)
- # Note: even non-Posix ISC needs  to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--echo "$as_me:17835: checking for main in -lcposix" >&5
-+echo "$as_me:18328: 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
-@@ -17840,7 +18333,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17843 "configure"
-+#line 18336 "configure"
- #include "confdefs.h"
- 
- int
-@@ -17852,16 +18345,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17855: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17858: \$? = $ac_status" >&5
-+  echo "$as_me:18351: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17861: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18354: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17864: \$? = $ac_status" >&5
-+  echo "$as_me:18357: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -17872,7 +18365,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17875: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:18368: 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 <&5
-+	echo "$as_me:18379: 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
-@@ -17891,7 +18384,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17894 "configure"
-+#line 18387 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17910,16 +18403,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17913: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18406: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17916: \$? = $ac_status" >&5
-+  echo "$as_me:18409: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17919: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18412: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17922: \$? = $ac_status" >&5
-+  echo "$as_me:18415: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -17930,7 +18423,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17933: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:18426: 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
- 
-@@ -17953,14 +18446,14 @@
- fi
- fi
- 
--echo "$as_me:17956: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:18449: 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 17963 "configure"
-+#line 18456 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17980,16 +18473,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17983: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18476: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17986: \$? = $ac_status" >&5
-+  echo "$as_me:18479: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17989: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18482: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17992: \$? = $ac_status" >&5
-+  echo "$as_me:18485: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -18001,7 +18494,7 @@
- 
- fi
- 
--echo "$as_me:18004: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:18497: 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
-@@ -18016,13 +18509,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:18019: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:18512: 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 18025 "configure"
-+#line 18518 "configure"
- #include "confdefs.h"
- 
- int
-@@ -18080,16 +18573,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18083: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18576: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18086: \$? = $ac_status" >&5
-+  echo "$as_me:18579: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18089: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18582: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18092: \$? = $ac_status" >&5
-+  echo "$as_me:18585: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -18099,7 +18592,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18102: result: $ac_cv_c_const" >&5
-+echo "$as_me:18595: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -18109,7 +18602,7 @@
- 
- fi
- 
--echo "$as_me:18112: checking for inline" >&5
-+echo "$as_me:18605: 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
-@@ -18117,7 +18610,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18120 "configure"
-+#line 18613 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -18126,16 +18619,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18129: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18622: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18132: \$? = $ac_status" >&5
-+  echo "$as_me:18625: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18135: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18138: \$? = $ac_status" >&5
-+  echo "$as_me:18631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -18146,7 +18639,7 @@
- done
- 
- fi
--echo "$as_me:18149: result: $ac_cv_c_inline" >&5
-+echo "$as_me:18642: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -18172,7 +18665,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		echo "$as_me:18175: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:18668: checking if $CC supports options to tune inlining" >&5
- echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18181,7 +18674,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 18184 "configure"
-+#line 18677 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -18193,16 +18686,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18196: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18689: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18199: \$? = $ac_status" >&5
-+  echo "$as_me:18692: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18202: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18695: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18205: \$? = $ac_status" >&5
-+  echo "$as_me:18698: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -18214,7 +18707,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:18217: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:18710: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
- 		if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -18320,7 +18813,7 @@
- 	fi
- fi
- 
--echo "$as_me:18323: checking for signal global datatype" >&5
-+echo "$as_me:18816: 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
-@@ -18332,7 +18825,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18335 "configure"
-+#line 18828 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18355,16 +18848,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18358: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18361: \$? = $ac_status" >&5
-+  echo "$as_me:18854: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18364: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18857: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18367: \$? = $ac_status" >&5
-+  echo "$as_me:18860: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -18378,7 +18871,7 @@
- 
- fi
- 
--echo "$as_me:18381: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:18874: 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 <&5
-+echo "$as_me:18883: 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
-@@ -18397,7 +18890,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18400 "configure"
-+#line 18893 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -18432,15 +18925,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18435: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18928: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18438: \$? = $ac_status" >&5
-+  echo "$as_me:18931: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18440: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18933: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18443: \$? = $ac_status" >&5
-+  echo "$as_me:18936: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -18455,7 +18948,7 @@
- 
- fi
- 
--echo "$as_me:18458: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:18951: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:18963: 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 18477 "configure"
-+#line 18970 "configure"
- #include "confdefs.h"
- 
- int
-@@ -18486,16 +18979,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18489: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18982: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18492: \$? = $ac_status" >&5
-+  echo "$as_me:18985: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18495: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18988: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18498: \$? = $ac_status" >&5
-+  echo "$as_me:18991: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -18507,7 +19000,7 @@
- 
- fi
- 
--echo "$as_me:18510: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:19003: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -18523,14 +19016,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:18526: checking if external errno is declared" >&5
-+echo "$as_me:19019: 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 18533 "configure"
-+#line 19026 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -18548,16 +19041,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18551: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19044: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18554: \$? = $ac_status" >&5
-+  echo "$as_me:19047: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18557: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19050: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18560: \$? = $ac_status" >&5
-+  echo "$as_me:19053: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -18568,7 +19061,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:18571: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:19064: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -18583,14 +19076,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:18586: checking if external errno exists" >&5
-+echo "$as_me:19079: 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 18593 "configure"
-+#line 19086 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -18605,16 +19098,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18608: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19101: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18611: \$? = $ac_status" >&5
-+  echo "$as_me:19104: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18614: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19107: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18617: \$? = $ac_status" >&5
-+  echo "$as_me:19110: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -18625,7 +19118,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:18628: result: $cf_cv_have_errno" >&5
-+echo "$as_me:19121: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -18638,7 +19131,7 @@
- 
- fi
- 
--echo "$as_me:18641: checking if data-only library module links" >&5
-+echo "$as_me:19134: 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
-@@ -18646,20 +19139,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:19145: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18655: \$? = $ac_status" >&5
-+  echo "$as_me:19148: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:19168: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18678: \$? = $ac_status" >&5
-+  echo "$as_me:19171: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -18688,7 +19181,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18691 "configure"
-+#line 19184 "configure"
- #include "confdefs.h"
- 
- 	int main(void)
-@@ -18699,15 +19192,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18702: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19195: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18705: \$? = $ac_status" >&5
-+  echo "$as_me:19198: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18707: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19200: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18710: \$? = $ac_status" >&5
-+  echo "$as_me:19203: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -18722,7 +19215,7 @@
- 
- fi
- 
--echo "$as_me:18725: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:19218: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -18764,13 +19257,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:18767: checking for $ac_func" >&5
-+echo "$as_me:19260: 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 18773 "configure"
-+#line 19266 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -18801,16 +19294,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18804: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19297: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18807: \$? = $ac_status" >&5
-+  echo "$as_me:19300: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18810: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19303: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18813: \$? = $ac_status" >&5
-+  echo "$as_me:19306: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18820,7 +19313,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18823: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:19316: 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 <&5
-+	{ { echo "$as_me:19328: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -18841,7 +19334,7 @@
- then
- 	if test "x$ac_cv_func_vsnprintf" = xyes
- 	then
--		{ echo "$as_me:18844: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
-+		{ echo "$as_me:19337: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
- echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
- 	else
- 
-@@ -18854,14 +19347,14 @@
- 
- if test "x$with_getcap" = "xyes" ; then
- 
--echo "$as_me:18857: checking for terminal-capability database functions" >&5
-+echo "$as_me:19350: 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 18864 "configure"
-+#line 19357 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18881,16 +19374,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18884: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19377: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18887: \$? = $ac_status" >&5
-+  echo "$as_me:19380: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18890: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19383: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18893: \$? = $ac_status" >&5
-+  echo "$as_me:19386: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -18901,7 +19394,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:18904: result: $cf_cv_cgetent" >&5
-+echo "$as_me:19397: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- 
- if test "$cf_cv_cgetent" = yes
-@@ -18911,14 +19404,14 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--echo "$as_me:18914: checking if cgetent uses const parameter" >&5
-+echo "$as_me:19407: checking if cgetent uses const parameter" >&5
- echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
- if test "${cf_cv_cgetent_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18921 "configure"
-+#line 19414 "configure"
- #include "confdefs.h"
- 
- #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
-@@ -18941,16 +19434,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18944: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19437: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18947: \$? = $ac_status" >&5
-+  echo "$as_me:19440: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18950: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19443: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18953: \$? = $ac_status" >&5
-+  echo "$as_me:19446: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -18961,7 +19454,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:18964: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:19457: result: $cf_cv_cgetent_const" >&5
- echo "${ECHO_T}$cf_cv_cgetent_const" >&6
- 	if test "$cf_cv_cgetent_const" = yes
- 	then
-@@ -18975,14 +19468,14 @@
- 
- fi
- 
--echo "$as_me:18978: checking for isascii" >&5
-+echo "$as_me:19471: 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 18985 "configure"
-+#line 19478 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -18994,16 +19487,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18997: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19490: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19000: \$? = $ac_status" >&5
-+  echo "$as_me:19493: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19003: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19496: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19006: \$? = $ac_status" >&5
-+  echo "$as_me:19499: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -19014,7 +19507,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:19017: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:19510: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -19022,10 +19515,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:19025: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:19518: 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 19028 "configure"
-+#line 19521 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19039,16 +19532,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19042: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19535: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19045: \$? = $ac_status" >&5
-+  echo "$as_me:19538: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19048: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19541: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19051: \$? = $ac_status" >&5
-+  echo "$as_me:19544: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -19056,7 +19549,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19059 "configure"
-+#line 19552 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -19071,16 +19564,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19074: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19567: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19077: \$? = $ac_status" >&5
-+  echo "$as_me:19570: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19080: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19573: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19083: \$? = $ac_status" >&5
-+  echo "$as_me:19576: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -19096,11 +19589,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:19099: result: $sigact_bad" >&5
-+echo "$as_me:19592: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:19103: checking if nanosleep really works" >&5
-+echo "$as_me:19596: 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
-@@ -19110,7 +19603,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19113 "configure"
-+#line 19606 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19135,15 +19628,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:19138: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19631: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19141: \$? = $ac_status" >&5
-+  echo "$as_me:19634: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:19143: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19636: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19146: \$? = $ac_status" >&5
-+  echo "$as_me:19639: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -19155,7 +19648,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:19158: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:19651: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -19172,23 +19665,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19175: checking for $ac_header" >&5
-+echo "$as_me:19668: 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 19181 "configure"
-+#line 19674 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19185: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19678: \"$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:19191: \$? = $ac_status" >&5
-+  echo "$as_me:19684: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -19207,7 +19700,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19210: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19703: 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 <&5
-+	echo "$as_me:19720: 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 19230 "configure"
-+#line 19723 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -19239,16 +19732,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19242: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19735: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19245: \$? = $ac_status" >&5
-+  echo "$as_me:19738: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19248: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19741: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19251: \$? = $ac_status" >&5
-+  echo "$as_me:19744: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -19256,7 +19749,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 19259 "configure"
-+#line 19752 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -19270,16 +19763,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19273: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19766: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19276: \$? = $ac_status" >&5
-+  echo "$as_me:19769: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19279: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19772: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19282: \$? = $ac_status" >&5
-+  echo "$as_me:19775: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -19295,19 +19788,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:19298: result: $termios_bad" >&5
-+	echo "$as_me:19791: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:19303: checking for tcgetattr" >&5
-+echo "$as_me:19796: 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 19310 "configure"
-+#line 19803 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19335,16 +19828,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19338: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19341: \$? = $ac_status" >&5
-+  echo "$as_me:19834: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19344: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19837: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19347: \$? = $ac_status" >&5
-+  echo "$as_me:19840: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -19354,21 +19847,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:19357: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:19850: 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:19364: checking for vsscanf function or workaround" >&5
-+echo "$as_me:19857: 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 19371 "configure"
-+#line 19864 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19384,16 +19877,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19387: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19880: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19390: \$? = $ac_status" >&5
-+  echo "$as_me:19883: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19393: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19886: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19396: \$? = $ac_status" >&5
-+  echo "$as_me:19889: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -19401,7 +19894,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19404 "configure"
-+#line 19897 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19423,16 +19916,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19426: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19919: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19429: \$? = $ac_status" >&5
-+  echo "$as_me:19922: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19432: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19925: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19435: \$? = $ac_status" >&5
-+  echo "$as_me:19928: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -19440,7 +19933,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19443 "configure"
-+#line 19936 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19462,16 +19955,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19465: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19958: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19468: \$? = $ac_status" >&5
-+  echo "$as_me:19961: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19471: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19964: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19474: \$? = $ac_status" >&5
-+  echo "$as_me:19967: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -19486,7 +19979,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:19489: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:19982: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in
-@@ -19512,23 +20005,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19515: checking for $ac_header" >&5
-+echo "$as_me:20008: 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 19521 "configure"
-+#line 20014 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19525: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20018: \"$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:19531: \$? = $ac_status" >&5
-+  echo "$as_me:20024: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -19547,7 +20040,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19550: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20043: 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 <&5
-+echo "$as_me:20053: 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
-@@ -19568,7 +20061,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19571 "configure"
-+#line 20064 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19609,15 +20102,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:19612: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20105: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19615: \$? = $ac_status" >&5
-+  echo "$as_me:20108: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:19617: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20110: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19620: \$? = $ac_status" >&5
-+  echo "$as_me:20113: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -19632,16 +20125,16 @@
- fi
- 
- fi
--echo "$as_me:19635: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:20128: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:19638: checking for mkstemp" >&5
-+	echo "$as_me:20131: 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 19644 "configure"
-+#line 20137 "configure"
- #include "confdefs.h"
- #define mkstemp autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -19672,16 +20165,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19675: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19678: \$? = $ac_status" >&5
-+  echo "$as_me:20171: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19681: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20174: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19684: \$? = $ac_status" >&5
-+  echo "$as_me:20177: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -19691,7 +20184,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:19694: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:20187: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -19712,21 +20205,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:19715: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:20208: 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:19718: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:20211: 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:19724: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:20217: 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 19729 "configure"
-+#line 20222 "configure"
- #include "confdefs.h"
- #include 
- /* If setvbuf has the reversed format, exit 0. */
-@@ -19743,15 +20236,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:19746: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20239: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19749: \$? = $ac_status" >&5
-+  echo "$as_me:20242: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:19751: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20244: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19754: \$? = $ac_status" >&5
-+  echo "$as_me:20247: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -19764,7 +20257,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:19767: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:20260: 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
- 
-@@ -19775,13 +20268,13 @@
- fi
- 
- fi
--echo "$as_me:19778: checking for intptr_t" >&5
-+echo "$as_me:20271: checking for intptr_t" >&5
- echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
- if test "${ac_cv_type_intptr_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19784 "configure"
-+#line 20277 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -19796,16 +20289,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19799: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20292: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19802: \$? = $ac_status" >&5
-+  echo "$as_me:20295: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19805: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20298: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19808: \$? = $ac_status" >&5
-+  echo "$as_me:20301: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_intptr_t=yes
- else
-@@ -19815,7 +20308,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:19818: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:20311: result: $ac_cv_type_intptr_t" >&5
- echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
- if test $ac_cv_type_intptr_t = yes; then
-   :
-@@ -19827,13 +20320,13 @@
- 
- fi
- 
--echo "$as_me:19830: checking for ssize_t" >&5
-+echo "$as_me:20323: checking for ssize_t" >&5
- echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
- if test "${ac_cv_type_ssize_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19836 "configure"
-+#line 20329 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -19848,16 +20341,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20344: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19854: \$? = $ac_status" >&5
-+  echo "$as_me:20347: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20350: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19860: \$? = $ac_status" >&5
-+  echo "$as_me:20353: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_ssize_t=yes
- else
-@@ -19867,7 +20360,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:19870: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:20363: result: $ac_cv_type_ssize_t" >&5
- echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
- if test $ac_cv_type_ssize_t = yes; then
-   :
-@@ -19879,14 +20372,14 @@
- 
- fi
- 
--echo "$as_me:19882: checking for type sigaction_t" >&5
-+echo "$as_me:20375: 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 19889 "configure"
-+#line 20382 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19899,16 +20392,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19902: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20395: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19905: \$? = $ac_status" >&5
-+  echo "$as_me:20398: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19908: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20401: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19911: \$? = $ac_status" >&5
-+  echo "$as_me:20404: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -19919,14 +20412,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:19922: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:20415: 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:19929: checking declaration of size-change" >&5
-+echo "$as_me:20422: 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
-@@ -19947,7 +20440,7 @@
- 
- 	fi
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19950 "configure"
-+#line 20443 "configure"
- #include "confdefs.h"
- #include 
- #ifdef HAVE_TERMIOS_H
-@@ -19993,16 +20486,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19996: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20489: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19999: \$? = $ac_status" >&5
-+  echo "$as_me:20492: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20495: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20005: \$? = $ac_status" >&5
-+  echo "$as_me:20498: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -20021,7 +20514,7 @@
- done
- 
- fi
--echo "$as_me:20024: result: $cf_cv_sizechange" >&5
-+echo "$as_me:20517: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 
-@@ -20039,13 +20532,13 @@
- 	esac
- fi
- 
--echo "$as_me:20042: checking for memmove" >&5
-+echo "$as_me:20535: 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 20048 "configure"
-+#line 20541 "configure"
- #include "confdefs.h"
- #define memmove autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -20076,16 +20569,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20079: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20572: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20082: \$? = $ac_status" >&5
-+  echo "$as_me:20575: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20085: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20578: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20088: \$? = $ac_status" >&5
-+  echo "$as_me:20581: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -20095,19 +20588,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20098: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:20591: 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:20104: checking for bcopy" >&5
-+echo "$as_me:20597: 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 20110 "configure"
-+#line 20603 "configure"
- #include "confdefs.h"
- #define bcopy autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -20138,16 +20631,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20141: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20634: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20144: \$? = $ac_status" >&5
-+  echo "$as_me:20637: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20150: \$? = $ac_status" >&5
-+  echo "$as_me:20643: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -20157,11 +20650,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20160: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:20653: 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:20164: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:20657: 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
-@@ -20171,7 +20664,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20174 "configure"
-+#line 20667 "configure"
- #include "confdefs.h"
- 
- int main(void) {
-@@ -20185,15 +20678,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20188: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20681: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20191: \$? = $ac_status" >&5
-+  echo "$as_me:20684: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20193: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20196: \$? = $ac_status" >&5
-+  echo "$as_me:20689: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -20206,7 +20699,7 @@
- fi
- 
- fi
--echo "$as_me:20209: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:20702: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -20233,13 +20726,13 @@
- for ac_func in posix_openpt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:20236: checking for $ac_func" >&5
-+echo "$as_me:20729: 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 20242 "configure"
-+#line 20735 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -20270,16 +20763,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20273: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20766: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20276: \$? = $ac_status" >&5
-+  echo "$as_me:20769: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20279: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20772: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20282: \$? = $ac_status" >&5
-+  echo "$as_me:20775: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -20289,7 +20782,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20292: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:20785: 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 <&5
-+echo "$as_me:20795: 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
-@@ -20309,7 +20802,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20312 "configure"
-+#line 20805 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20361,15 +20854,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20364: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20857: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20367: \$? = $ac_status" >&5
-+  echo "$as_me:20860: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20369: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20862: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20372: \$? = $ac_status" >&5
-+  echo "$as_me:20865: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -20381,21 +20874,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:20384: result: $cf_cv_working_poll" >&5
-+echo "$as_me:20877: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:20391: checking for va_copy" >&5
-+echo "$as_me:20884: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 20398 "configure"
-+#line 20891 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20412,16 +20905,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20415: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20908: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20418: \$? = $ac_status" >&5
-+  echo "$as_me:20911: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20421: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20914: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20424: \$? = $ac_status" >&5
-+  echo "$as_me:20917: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -20431,7 +20924,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20434: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:20927: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- if test "$cf_cv_have_va_copy" = yes;
-@@ -20443,14 +20936,14 @@
- 
- else # !cf_cv_have_va_copy
- 
--echo "$as_me:20446: checking for __va_copy" >&5
-+echo "$as_me:20939: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 20453 "configure"
-+#line 20946 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20467,16 +20960,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20470: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20963: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20473: \$? = $ac_status" >&5
-+  echo "$as_me:20966: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20476: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20969: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20479: \$? = $ac_status" >&5
-+  echo "$as_me:20972: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -20486,7 +20979,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20489: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:20982: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- if test "$cf_cv_have___va_copy" = yes
-@@ -20498,14 +20991,14 @@
- 
- else # !cf_cv_have___va_copy
- 
--echo "$as_me:20501: checking for __builtin_va_copy" >&5
-+echo "$as_me:20994: checking for __builtin_va_copy" >&5
- echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___builtin_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 20508 "configure"
-+#line 21001 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20522,16 +21015,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20525: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21018: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20528: \$? = $ac_status" >&5
-+  echo "$as_me:21021: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20531: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21024: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20534: \$? = $ac_status" >&5
-+  echo "$as_me:21027: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___builtin_va_copy=yes
- else
-@@ -20541,7 +21034,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20544: result: $cf_cv_have___builtin_va_copy" >&5
-+echo "$as_me:21037: result: $cf_cv_have___builtin_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
- 
- test "$cf_cv_have___builtin_va_copy" = yes &&
-@@ -20559,14 +21052,14 @@
- 	;;
- 
- (*)
--	echo "$as_me:20562: checking if we can simply copy va_list" >&5
-+	echo "$as_me:21055: checking if we can simply copy va_list" >&5
- echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
- if test "${cf_cv_pointer_va_list+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 20569 "configure"
-+#line 21062 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20583,16 +21076,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20586: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21079: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20589: \$? = $ac_status" >&5
-+  echo "$as_me:21082: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20592: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21085: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20595: \$? = $ac_status" >&5
-+  echo "$as_me:21088: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_pointer_va_list=yes
- else
-@@ -20602,19 +21095,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20605: result: $cf_cv_pointer_va_list" >&5
-+echo "$as_me:21098: result: $cf_cv_pointer_va_list" >&5
- echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
- 
- 	if test "$cf_cv_pointer_va_list" = no
- 	then
--		echo "$as_me:20610: checking if we can copy va_list indirectly" >&5
-+		echo "$as_me:21103: checking if we can copy va_list indirectly" >&5
- echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
- if test "${cf_cv_array_va_list+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 20617 "configure"
-+#line 21110 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20631,16 +21124,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20634: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21127: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20637: \$? = $ac_status" >&5
-+  echo "$as_me:21130: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21133: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20643: \$? = $ac_status" >&5
-+  echo "$as_me:21136: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_array_va_list=yes
- else
-@@ -20650,7 +21143,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20653: result: $cf_cv_array_va_list" >&5
-+echo "$as_me:21146: result: $cf_cv_array_va_list" >&5
- echo "${ECHO_T}$cf_cv_array_va_list" >&6
- 		test "$cf_cv_array_va_list" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -20661,13 +21154,13 @@
- 	;;
- esac
- 
--echo "$as_me:20664: checking for pid_t" >&5
-+echo "$as_me:21157: checking for pid_t" >&5
- echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
- if test "${ac_cv_type_pid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20670 "configure"
-+#line 21163 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -20682,16 +21175,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20685: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20688: \$? = $ac_status" >&5
-+  echo "$as_me:21181: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20691: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20694: \$? = $ac_status" >&5
-+  echo "$as_me:21187: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -20701,7 +21194,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:20704: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:21197: result: $ac_cv_type_pid_t" >&5
- echo "${ECHO_T}$ac_cv_type_pid_t" >&6
- if test $ac_cv_type_pid_t = yes; then
-   :
-@@ -20716,23 +21209,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:20719: checking for $ac_header" >&5
-+echo "$as_me:21212: 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 20725 "configure"
-+#line 21218 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:20729: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:21222: \"$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:20735: \$? = $ac_status" >&5
-+  echo "$as_me:21228: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -20751,7 +21244,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:20754: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:21247: 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 <&5
-+echo "$as_me:21260: 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 20773 "configure"
-+#line 21266 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -20801,16 +21294,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20804: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21297: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20807: \$? = $ac_status" >&5
-+  echo "$as_me:21300: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20810: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21303: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20813: \$? = $ac_status" >&5
-+  echo "$as_me:21306: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -20820,7 +21313,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20823: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:21316: 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 <&5
-+  echo "$as_me:21328: checking for working fork" >&5
- echo $ECHO_N "checking for working fork... $ECHO_C" >&6
- if test "${ac_cv_func_fork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20855,15 +21348,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20858: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21351: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20861: \$? = $ac_status" >&5
-+  echo "$as_me:21354: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20863: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21356: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20866: \$? = $ac_status" >&5
-+  echo "$as_me:21359: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -20875,7 +21368,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:20878: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:21371: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -20889,12 +21382,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:20892: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:21385: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
- fi
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:20897: checking for working vfork" >&5
-+  echo "$as_me:21390: checking for working vfork" >&5
- echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
- if test "${ac_cv_func_vfork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20903,7 +21396,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20906 "configure"
-+#line 21399 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include 
-@@ -21000,15 +21493,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21003: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21496: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21006: \$? = $ac_status" >&5
-+  echo "$as_me:21499: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21008: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21501: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21011: \$? = $ac_status" >&5
-+  echo "$as_me:21504: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -21020,13 +21513,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:21023: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:21516: result: $ac_cv_func_vfork_works" >&5
- echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
- 
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-   ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:21029: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:21522: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
- fi
- 
-@@ -21051,7 +21544,7 @@
- 
- fi
- 
--echo "$as_me:21054: checking if fopen accepts explicit binary mode" >&5
-+echo "$as_me:21547: checking if fopen accepts explicit binary mode" >&5
- echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
- if test "${cf_cv_fopen_bin_r+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21061,7 +21554,7 @@
-   cf_cv_fopen_bin_r=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21064 "configure"
-+#line 21557 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -21079,9 +21572,8 @@
- 			for (p = 0; p < 256; ++p) {
- 				q = fgetc(fp);
- 				if (q != p) {
--					fprintf(stderr, "OOPS:%d ->%d\n", p, q);
--					//rc = 1;
--					//break;
-+					rc = 1;
-+					break;
- 				}
- 			}
- 		} else {
-@@ -21095,15 +21587,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21098: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21590: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21101: \$? = $ac_status" >&5
-+  echo "$as_me:21593: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21103: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21595: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21106: \$? = $ac_status" >&5
-+  echo "$as_me:21598: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fopen_bin_r=yes
- else
-@@ -21116,7 +21608,7 @@
- fi
- 
- fi
--echo "$as_me:21119: result: $cf_cv_fopen_bin_r" >&5
-+echo "$as_me:21611: result: $cf_cv_fopen_bin_r" >&5
- echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
- test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF
- #define USE_FOPEN_BIN_R 1
-@@ -21124,7 +21616,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:21127: checking for openpty in -lutil" >&5
-+echo "$as_me:21619: 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
-@@ -21132,7 +21624,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 21135 "configure"
-+#line 21627 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -21151,16 +21643,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21154: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21646: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21157: \$? = $ac_status" >&5
-+  echo "$as_me:21649: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21160: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21652: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21163: \$? = $ac_status" >&5
-+  echo "$as_me:21655: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -21171,7 +21663,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:21174: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:21666: 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
-@@ -21179,7 +21671,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:21182: checking for openpty header" >&5
-+echo "$as_me:21674: 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
-@@ -21206,7 +21698,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21209 "configure"
-+#line 21701 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -21223,16 +21715,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21226: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21718: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21229: \$? = $ac_status" >&5
-+  echo "$as_me:21721: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21232: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21724: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21235: \$? = $ac_status" >&5
-+  echo "$as_me:21727: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -21250,7 +21742,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:21253: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:21745: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -21323,7 +21815,7 @@
- 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
- 
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 21326 "configure"
-+#line 21818 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -21335,16 +21827,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21338: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21830: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21341: \$? = $ac_status" >&5
-+  echo "$as_me:21833: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21344: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21347: \$? = $ac_status" >&5
-+  echo "$as_me:21839: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -21361,7 +21853,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:21364: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:21856: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -21397,7 +21889,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}:21400: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:21892: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -21408,7 +21900,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:21411: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:21903: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -21480,7 +21972,7 @@
- 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
- 
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 21483 "configure"
-+#line 21975 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -21492,16 +21984,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21495: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21987: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21498: \$? = $ac_status" >&5
-+  echo "$as_me:21990: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21501: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21993: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21504: \$? = $ac_status" >&5
-+  echo "$as_me:21996: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -21518,7 +22010,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:21521: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:22013: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -21598,7 +22090,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}:21601: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:22093: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -21615,23 +22107,23 @@
- 	fi
- esac
- 
--echo "$as_me:21618: checking for db.h" >&5
-+echo "$as_me:22110: 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 21624 "configure"
-+#line 22116 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:21628: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:22120: \"$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:21634: \$? = $ac_status" >&5
-+  echo "$as_me:22126: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -21650,11 +22142,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:21653: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:22145: 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:21657: checking for version of db" >&5
-+echo "$as_me:22149: 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
-@@ -21665,10 +22157,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:21668: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:22160: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21671 "configure"
-+#line 22163 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -21698,16 +22190,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21701: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:22193: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21704: \$? = $ac_status" >&5
-+  echo "$as_me:22196: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21707: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22199: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21710: \$? = $ac_status" >&5
-+  echo "$as_me:22202: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -21721,16 +22213,16 @@
- done
- 
- fi
--echo "$as_me:21724: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:22216: 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:21728: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:22220: 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:21733: checking for db libraries" >&5
-+echo "$as_me:22225: 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
-@@ -21760,10 +22252,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:21763: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:22255: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21766 "configure"
-+#line 22258 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -21818,16 +22310,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21821: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:22313: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21824: \$? = $ac_status" >&5
-+  echo "$as_me:22316: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21827: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22319: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21830: \$? = $ac_status" >&5
-+  echo "$as_me:22322: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -21847,11 +22339,11 @@
- done
- 
- fi
--echo "$as_me:21850: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:22342: 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:21854: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:22346: 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
-@@ -21877,7 +22369,7 @@
- 
- else
- 
--	{ { echo "$as_me:21880: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:22372: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -21892,7 +22384,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:21895: checking if we should include stdbool.h" >&5
-+echo "$as_me:22387: 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
-@@ -21900,7 +22392,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21903 "configure"
-+#line 22395 "configure"
- #include "confdefs.h"
- 
- int
-@@ -21912,23 +22404,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21915: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:22407: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21918: \$? = $ac_status" >&5
-+  echo "$as_me:22410: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21921: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22413: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21924: \$? = $ac_status" >&5
-+  echo "$as_me:22416: \$? = $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 21931 "configure"
-+#line 22423 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -21944,16 +22436,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21947: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:22439: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21950: \$? = $ac_status" >&5
-+  echo "$as_me:22442: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21953: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21956: \$? = $ac_status" >&5
-+  echo "$as_me:22448: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -21967,13 +22459,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:21970: result: yes" >&5
-+then	echo "$as_me:22462: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:21972: result: no" >&5
-+else	echo "$as_me:22464: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:21976: checking for builtin bool type" >&5
-+echo "$as_me:22468: 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
-@@ -21981,7 +22473,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21984 "configure"
-+#line 22476 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -21996,16 +22488,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21999: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:22491: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:22002: \$? = $ac_status" >&5
-+  echo "$as_me:22494: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22005: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22497: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22008: \$? = $ac_status" >&5
-+  echo "$as_me:22500: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -22018,9 +22510,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:22021: result: yes" >&5
-+then	echo "$as_me:22513: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:22023: result: no" >&5
-+else	echo "$as_me:22515: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22037,10 +22529,10 @@
- 
- 	cf_save="$LIBS"
- 	LIBS="$LIBS $CXXLIBS"
--	echo "$as_me:22040: checking if we already have C++ library" >&5
-+	echo "$as_me:22532: checking if we already have C++ library" >&5
- echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22043 "configure"
-+#line 22535 "configure"
- #include "confdefs.h"
- 
- 			#include 
-@@ -22054,16 +22546,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:22057: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:22549: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:22060: \$? = $ac_status" >&5
-+  echo "$as_me:22552: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:22063: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22555: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22066: \$? = $ac_status" >&5
-+  echo "$as_me:22558: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_libstdcpp=yes
- else
-@@ -22072,7 +22564,7 @@
- cf_have_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:22075: result: $cf_have_libstdcpp" >&5
-+	echo "$as_me:22567: result: $cf_have_libstdcpp" >&5
- echo "${ECHO_T}$cf_have_libstdcpp" >&6
- 	LIBS="$cf_save"
- 
-@@ -22091,7 +22583,7 @@
- 			;;
- 		esac
- 
--		echo "$as_me:22094: checking for library $cf_stdcpp_libname" >&5
-+		echo "$as_me:22586: 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
-@@ -22117,7 +22609,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 22120 "configure"
-+#line 22612 "configure"
- #include "confdefs.h"
- 
- 				#include 
-@@ -22131,16 +22623,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:22134: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:22626: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:22137: \$? = $ac_status" >&5
-+  echo "$as_me:22629: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:22140: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22143: \$? = $ac_status" >&5
-+  echo "$as_me:22635: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -22152,7 +22644,7 @@
- 			LIBS="$cf_save"
- 
- fi
--echo "$as_me:22155: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:22647: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- 		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -22174,7 +22666,7 @@
- 	fi
- fi
- 
--	echo "$as_me:22177: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:22669: 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
-@@ -22189,15 +22681,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 $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:22192: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:22684: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22195: \$? = $ac_status" >&5
-+  echo "$as_me:22687: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:22197: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:22689: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22200: \$? = $ac_status" >&5
-+  echo "$as_me:22692: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -22208,10 +22700,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:22211: result: yes" >&5
-+  echo "$as_me:22703: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:22214: result: no" >&5
-+  echo "$as_me:22706: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22231,7 +22723,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:22234: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:22726: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -22252,7 +22744,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22255 "configure"
-+#line 22747 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -22266,16 +22758,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:22269: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:22761: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:22272: \$? = $ac_status" >&5
-+  echo "$as_me:22764: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:22275: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22767: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22278: \$? = $ac_status" >&5
-+  echo "$as_me:22770: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -22312,7 +22804,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 22315 "configure"
-+#line 22807 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -22326,16 +22818,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:22329: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:22821: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:22332: \$? = $ac_status" >&5
-+  echo "$as_me:22824: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:22335: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22827: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22338: \$? = $ac_status" >&5
-+  echo "$as_me:22830: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -22368,7 +22860,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:22371: result: $cf_cxx_library" >&5
-+	echo "$as_me:22863: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -22384,7 +22876,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:22387: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:22879: 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
-@@ -22401,18 +22893,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 22404 "configure"
-+#line 22896 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:22409: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:22901: \"$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:22415: \$? = $ac_status" >&5
-+  echo "$as_me:22907: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -22435,17 +22927,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 22438 "configure"
-+#line 22930 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:22442: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:22934: \"$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:22448: \$? = $ac_status" >&5
-+  echo "$as_me:22940: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -22482,7 +22974,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:22485: result: $CXXCPP" >&5
-+echo "$as_me:22977: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -22492,18 +22984,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 22495 "configure"
-+#line 22987 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:22500: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:22992: \"$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:22506: \$? = $ac_status" >&5
-+  echo "$as_me:22998: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -22526,17 +23018,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 22529 "configure"
-+#line 23021 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:22533: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:23025: \"$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:22539: \$? = $ac_status" >&5
-+  echo "$as_me:23031: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -22564,7 +23056,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:22567: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:23059: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -22579,23 +23071,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:22582: checking for $ac_header" >&5
-+echo "$as_me:23074: 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 22588 "configure"
-+#line 23080 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:22592: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:23084: \"$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:22598: \$? = $ac_status" >&5
-+  echo "$as_me:23090: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -22614,7 +23106,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:22617: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:23109: 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 <&5
-+echo "$as_me:23122: 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 22636 "configure"
-+#line 23128 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:22640: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:23132: \"$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:22646: \$? = $ac_status" >&5
-+  echo "$as_me:23138: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -22662,7 +23154,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:22665: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:23157: 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 <&5
-+	echo "$as_me:23168: 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 22679 "configure"
-+#line 23171 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -22693,16 +23185,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22696: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23188: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:22699: \$? = $ac_status" >&5
-+  echo "$as_me:23191: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22702: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23194: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22705: \$? = $ac_status" >&5
-+  echo "$as_me:23197: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -22711,7 +23203,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:22714: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:23206: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -22722,7 +23214,7 @@
- 	fi
- fi
- 
--echo "$as_me:22725: checking if we should include stdbool.h" >&5
-+echo "$as_me:23217: 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
-@@ -22730,7 +23222,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22733 "configure"
-+#line 23225 "configure"
- #include "confdefs.h"
- 
- int
-@@ -22742,23 +23234,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22745: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23237: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:22748: \$? = $ac_status" >&5
-+  echo "$as_me:23240: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22751: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22754: \$? = $ac_status" >&5
-+  echo "$as_me:23246: \$? = $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 22761 "configure"
-+#line 23253 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -22774,16 +23266,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22777: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23269: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:22780: \$? = $ac_status" >&5
-+  echo "$as_me:23272: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22783: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23275: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22786: \$? = $ac_status" >&5
-+  echo "$as_me:23278: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -22797,13 +23289,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:22800: result: yes" >&5
-+then	echo "$as_me:23292: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:22802: result: no" >&5
-+else	echo "$as_me:23294: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:22806: checking for builtin bool type" >&5
-+echo "$as_me:23298: 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
-@@ -22811,7 +23303,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22814 "configure"
-+#line 23306 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -22826,16 +23318,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22829: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23321: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:22832: \$? = $ac_status" >&5
-+  echo "$as_me:23324: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22835: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23327: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22838: \$? = $ac_status" >&5
-+  echo "$as_me:23330: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -22848,13 +23340,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:22851: result: yes" >&5
-+then	echo "$as_me:23343: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:22853: result: no" >&5
-+else	echo "$as_me:23345: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:22857: checking for size of bool" >&5
-+echo "$as_me:23349: 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
-@@ -22865,7 +23357,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 22868 "configure"
-+#line 23360 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -22907,15 +23399,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:22910: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:23402: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:22913: \$? = $ac_status" >&5
-+  echo "$as_me:23405: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:22915: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23407: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22918: \$? = $ac_status" >&5
-+  echo "$as_me:23410: \$? = $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
-@@ -22933,18 +23425,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:22936: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:23428: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:22942: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:23434: 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:22947: checking for special defines needed for etip.h" >&5
-+echo "$as_me:23439: 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"
-@@ -22962,7 +23454,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 22965 "configure"
-+#line 23457 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -22976,16 +23468,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22979: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23471: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:22982: \$? = $ac_status" >&5
-+  echo "$as_me:23474: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22985: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23477: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22988: \$? = $ac_status" >&5
-+  echo "$as_me:23480: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <&5
-+echo "$as_me:23501: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:23014: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:23506: 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
-@@ -23028,7 +23520,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 23031 "configure"
-+#line 23523 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -23047,15 +23539,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:23050: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:23542: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:23053: \$? = $ac_status" >&5
-+  echo "$as_me:23545: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:23055: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23547: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23058: \$? = $ac_status" >&5
-+  echo "$as_me:23550: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -23074,7 +23566,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:23077: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:23569: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -23084,7 +23576,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:23087: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:23579: 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
-@@ -23098,7 +23590,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 23101 "configure"
-+#line 23593 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -23142,16 +23634,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:23145: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23637: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:23148: \$? = $ac_status" >&5
-+  echo "$as_me:23640: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:23151: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23643: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23154: \$? = $ac_status" >&5
-+  echo "$as_me:23646: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -23169,7 +23661,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:23172: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:23664: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -23218,7 +23710,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:23221: checking for size of bool" >&5
-+echo "$as_me:23713: 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
-@@ -23229,7 +23721,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 23232 "configure"
-+#line 23724 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -23271,15 +23763,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:23766: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:23277: \$? = $ac_status" >&5
-+  echo "$as_me:23769: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:23279: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23771: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23282: \$? = $ac_status" >&5
-+  echo "$as_me:23774: \$? = $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
-@@ -23297,25 +23789,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:23300: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:23792: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:23306: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:23798: 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:23312: checking for fallback type of bool" >&5
-+			echo "$as_me:23804: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:23318: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:23810: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -23344,7 +23836,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:23347: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:23839: 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
-@@ -23356,7 +23848,7 @@
- cf_ada_config="#"
- # 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:23359: checking for $ac_word" >&5
-+echo "$as_me:23851: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnatmake_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -23371,7 +23863,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnatmake_exists="yes"
--echo "$as_me:23374: found $ac_dir/$ac_word" >&5
-+echo "$as_me:23866: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -23380,10 +23872,10 @@
- fi
- gnatmake_exists=$ac_cv_prog_gnatmake_exists
- if test -n "$gnatmake_exists"; then
--  echo "$as_me:23383: result: $gnatmake_exists" >&5
-+  echo "$as_me:23875: result: $gnatmake_exists" >&5
- echo "${ECHO_T}$gnatmake_exists" >&6
- else
--  echo "$as_me:23386: result: no" >&5
-+  echo "$as_me:23878: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -23393,7 +23885,7 @@
- else
- 	# Extract the first word of "gprconfig", so it can be a program name with args.
- set dummy gprconfig; ac_word=$2
--echo "$as_me:23396: checking for $ac_word" >&5
-+echo "$as_me:23888: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gprconfig_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -23408,7 +23900,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gprconfig_exists="yes"
--echo "$as_me:23411: found $ac_dir/$ac_word" >&5
-+echo "$as_me:23903: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -23417,10 +23909,10 @@
- fi
- gprconfig_exists=$ac_cv_prog_gprconfig_exists
- if test -n "$gprconfig_exists"; then
--  echo "$as_me:23420: result: $gprconfig_exists" >&5
-+  echo "$as_me:23912: result: $gprconfig_exists" >&5
- echo "${ECHO_T}$gprconfig_exists" >&6
- else
--  echo "$as_me:23423: result: no" >&5
-+  echo "$as_me:23915: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -23433,7 +23925,7 @@
- 			cd conftest.src
- 			for cf_gprconfig in Ada C
- 			do
--				echo "$as_me:23436: checking for gprconfig name for $cf_gprconfig" >&5
-+				echo "$as_me:23928: checking for gprconfig name for $cf_gprconfig" >&5
- echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
- 				if test $cf_gprconfig = C
- 				then
-@@ -23452,10 +23944,10 @@
- 				if test -n "$cf_gprconfig_value"
- 				then
- 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
--					echo "$as_me:23455: result: $cf_gprconfig_value" >&5
-+					echo "$as_me:23947: result: $cf_gprconfig_value" >&5
- echo "${ECHO_T}$cf_gprconfig_value" >&6
- 				else
--					echo "$as_me:23458: result: missing" >&5
-+					echo "$as_me:23950: result: missing" >&5
- echo "${ECHO_T}missing" >&6
- 					cf_ada_config="#"
- 					break
-@@ -23471,12 +23963,12 @@
- 	if test "x$cf_ada_config" != "x#"
- 	then
- 
--echo "$as_me:23474: checking for gnat version" >&5
-+echo "$as_me:23966: 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:23479: result: $cf_gnat_version" >&5
-+echo "$as_me:23971: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -23484,7 +23976,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:23487: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:23979: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -23492,7 +23984,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:23495: checking for $ac_word" >&5
-+echo "$as_me:23987: 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
-@@ -23507,7 +23999,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:23510: found $ac_dir/$ac_word" >&5
-+echo "$as_me:24002: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -23516,10 +24008,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:23519: result: $M4_exists" >&5
-+  echo "$as_me:24011: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:23522: result: no" >&5
-+  echo "$as_me:24014: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -23528,7 +24020,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:23531: checking if GNAT works" >&5
-+			echo "$as_me:24023: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -23556,7 +24048,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--			echo "$as_me:23559: result: $cf_cv_prog_gnat_correct" >&5
-+			echo "$as_me:24051: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 		fi
- 	else
-@@ -23568,7 +24060,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:23571: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:24063: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -23585,10 +24077,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:23588: result: $ADAFLAGS" >&5
-+	echo "$as_me:24080: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:23591: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:24083: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -23598,11 +24090,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:23601: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:24093: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:23605: checking if GNAT supports generics" >&5
-+echo "$as_me:24097: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -23612,7 +24104,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:23615: result: $cf_gnat_generics" >&5
-+echo "$as_me:24107: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -23624,7 +24116,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:23627: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:24119: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -23672,7 +24164,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:23675: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:24167: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -23685,7 +24177,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:23688: checking if GNAT supports project files" >&5
-+echo "$as_me:24180: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -23748,15 +24240,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:23751: result: $cf_gnat_projects" >&5
-+echo "$as_me:24243: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:23757: checking if GNAT supports libraries" >&5
-+	echo "$as_me:24249: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:23759: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:24251: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -23776,7 +24268,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:23779: checking for ada-compiler" >&5
-+echo "$as_me:24271: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -23787,12 +24279,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:23790: result: $cf_ada_compiler" >&5
-+echo "$as_me:24282: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:23795: checking for ada-include" >&5
-+echo "$as_me:24287: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -23828,7 +24320,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:23831: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:24323: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -23837,10 +24329,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:23840: result: $ADA_INCLUDE" >&5
-+echo "$as_me:24332: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:23843: checking for ada-objects" >&5
-+echo "$as_me:24335: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -23876,7 +24368,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:23879: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:24371: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -23885,10 +24377,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:23888: result: $ADA_OBJECTS" >&5
-+echo "$as_me:24380: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:23891: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:24383: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -23898,14 +24390,14 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:23901: result: $with_ada_sharedlib" >&5
-+echo "$as_me:24393: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- if test "x$with_ada_sharedlib" != xno
- then
- 	if test "x$cf_gnat_projects" != xyes
- 	then
--		{ echo "$as_me:23908: WARNING: disabling shared-library since GNAT projects are not supported" >&5
-+		{ echo "$as_me:24400: WARNING: disabling shared-library since GNAT projects are not supported" >&5
- echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
- 		with_ada_sharedlib=no
- 	fi
-@@ -23931,13 +24423,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:23934: checking for wchar_t" >&5
-+	echo "$as_me:24426: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 23940 "configure"
-+#line 24432 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -23952,16 +24444,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:23955: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:24447: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:23958: \$? = $ac_status" >&5
-+  echo "$as_me:24450: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:23961: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24453: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23964: \$? = $ac_status" >&5
-+  echo "$as_me:24456: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -23971,10 +24463,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:23974: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:24466: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:23977: checking size of wchar_t" >&5
-+echo "$as_me:24469: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -23983,7 +24475,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 23986 "configure"
-+#line 24478 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -23995,21 +24487,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:23998: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:24490: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:24001: \$? = $ac_status" >&5
-+  echo "$as_me:24493: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:24004: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24496: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24007: \$? = $ac_status" >&5
-+  echo "$as_me:24499: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 24012 "configure"
-+#line 24504 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -24021,16 +24513,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:24024: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:24516: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:24027: \$? = $ac_status" >&5
-+  echo "$as_me:24519: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:24030: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24033: \$? = $ac_status" >&5
-+  echo "$as_me:24525: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -24046,7 +24538,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 24049 "configure"
-+#line 24541 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -24058,16 +24550,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:24061: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:24553: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:24064: \$? = $ac_status" >&5
-+  echo "$as_me:24556: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:24067: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24559: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24070: \$? = $ac_status" >&5
-+  echo "$as_me:24562: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -24083,7 +24575,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 24086 "configure"
-+#line 24578 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -24095,16 +24587,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:24098: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:24590: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:24101: \$? = $ac_status" >&5
-+  echo "$as_me:24593: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:24104: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24596: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24107: \$? = $ac_status" >&5
-+  echo "$as_me:24599: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -24117,12 +24609,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:24120: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:24612: 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 24125 "configure"
-+#line 24617 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -24138,15 +24630,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:24141: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:24633: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:24144: \$? = $ac_status" >&5
-+  echo "$as_me:24636: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:24146: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24638: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24149: \$? = $ac_status" >&5
-+  echo "$as_me:24641: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -24162,7 +24654,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:24165: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:24657: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <&5
-+echo "$as_me:24675: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -24222,7 +24714,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:24225: result: $LIB_SUBSETS" >&5
-+echo "$as_me:24717: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -24253,7 +24745,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:24256: checking default library suffix" >&5
-+echo "$as_me:24748: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -24264,10 +24756,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:24267: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:24759: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:24270: checking default library-dependency suffix" >&5
-+echo "$as_me:24762: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -24325,10 +24817,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:24328: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:24820: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:24331: checking default object directory" >&5
-+echo "$as_me:24823: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -24344,11 +24836,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:24347: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:24839: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:24351: checking c++ library-dependency suffix" >&5
-+echo "$as_me:24843: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -24416,7 +24908,7 @@
- 	fi
- 
- fi
--echo "$as_me:24419: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:24911: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -24592,19 +25084,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:24595: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:25087: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:24604: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:25096: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:24607: \$? = $ac_status" >&5
-+  echo "$as_me:25099: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -24615,10 +25107,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 24618 "configure"
-+#line 25110 "configure"
- #include "confdefs.h"
- 
--#line 24621 "configure"
-+#line 25113 "configure"
- #include 
- int cf_ldflags_static(FILE *fp);
- 
-@@ -24633,16 +25125,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:24636: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:25128: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:24639: \$? = $ac_status" >&5
-+  echo "$as_me:25131: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:24642: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:25134: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24645: \$? = $ac_status" >&5
-+  echo "$as_me:25137: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -24665,7 +25157,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:24668: result: $cf_ldflags_static" >&5
-+	echo "$as_me:25160: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -24681,7 +25173,7 @@
- 	;;
- esac
- 
--echo "$as_me:24684: checking where we will install curses.h" >&5
-+echo "$as_me:25176: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -24691,7 +25183,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:24694: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:25186: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -24699,7 +25191,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:24702: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:25194: 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
-@@ -24717,7 +25209,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:24720: checking for src modules" >&5
-+echo "$as_me:25212: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -24782,7 +25274,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:24785: result: $cf_cv_src_modules" >&5
-+echo "$as_me:25277: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -25019,7 +25511,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:25022: checking for $ac_word" >&5
-+echo "$as_me:25514: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -25036,7 +25528,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:25039: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:25531: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -25048,10 +25540,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:25051: result: $TIC_PATH" >&5
-+  echo "$as_me:25543: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:25054: result: no" >&5
-+  echo "$as_me:25546: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -25059,7 +25551,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:25062: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:25554: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -25095,7 +25587,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:25098: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:25590: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -25106,7 +25598,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:25109: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:25601: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -25122,7 +25614,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:25125: result: $PKG_CFLAGS" >&5
-+echo "$as_me:25617: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -25185,7 +25677,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:25188: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:25680: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -25295,7 +25787,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:25298: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:25790: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -25471,7 +25963,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:25474: error: ambiguous option: $1
-+    { { echo "$as_me:25966: 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;}
-@@ -25490,7 +25982,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:25493: error: unrecognized option: $1
-+  -*) { { echo "$as_me:25985: 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;}
-@@ -25610,7 +26102,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:25613: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:26105: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -26104,7 +26596,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:26107: creating $ac_file" >&5
-+    { echo "$as_me:26599: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -26122,7 +26614,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:26125: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:26617: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -26135,7 +26627,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:26138: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:26630: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -26151,7 +26643,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:26154: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:26646: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -26160,7 +26652,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:26163: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:26655: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -26197,7 +26689,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:26200: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:26692: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -26208,7 +26700,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:26211: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:26703: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -26257,7 +26749,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:26260: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:26752: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -26268,7 +26760,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:26271: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:26763: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -26281,7 +26773,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:26284: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:26776: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -26339,7 +26831,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:26342: $ac_file is unchanged" >&5
-+      { echo "$as_me:26834: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -26684,7 +27176,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:26687: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:27179: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: configure.in
-Prereq:  1.679 
---- ncurses-6.1-20190615+/configure.in	2019-03-30 21:44:53.000000000 +0000
-+++ ncurses-6.1-20190623/configure.in	2019-06-23 21:26:48.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.679 2019/03/30 21:44:53 tom Exp $
-+dnl $Id: configure.in,v 1.682 2019/06/23 21:26:48 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See https://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20170501)
--AC_REVISION($Revision: 1.679 $)
-+AC_REVISION($Revision: 1.682 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -1643,6 +1643,14 @@
- 
- CF_GETOPT_HEADER
- 
-+CF_CHECK_ENVIRON(environ)
-+CF_CHECK_GETENV
-+if test "x$cf_cv_consistent_getenv" = xno && \
-+	test "x$cf_with_trace" = xyes
-+then
-+	AC_MSG_WARN(The NCURSES_TRACE environment variable is not supported with this configuration)
-+fi
-+
- # check for ISC (this may also define _POSIX_SOURCE)
- # Note: even non-Posix ISC needs  to declare fd_set
- if test "x$ISC" = xyes ; then
-Index: dist.mk
-Prereq:  1.1288 
---- ncurses-6.1-20190615+/dist.mk	2019-06-15 12:46:35.000000000 +0000
-+++ ncurses-6.1-20190623/dist.mk	2019-06-23 15:31:40.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1288 2019/06/15 12:46:35 tom Exp $
-+# $Id: dist.mk,v 1.1290 2019/06/23 15:31:40 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20190615
-+NCURSES_PATCH = 20190623
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/adacurses6-config.1.html
---- ncurses-6.1-20190615+/doc/html/man/adacurses6-config.1.html	2019-06-15 23:31:08.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/adacurses6-config.1.html	2019-06-23 21:16:02.000000000 +0000
-@@ -125,7 +125,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20190615+/doc/html/man/captoinfo.1m.html	2019-06-15 23:31:08.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/captoinfo.1m.html	2019-06-23 21:16:02.000000000 +0000
-@@ -190,7 +190,7 @@
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/clear.1.html
---- ncurses-6.1-20190615+/doc/html/man/clear.1.html	2019-06-15 23:31:08.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/clear.1.html	2019-06-23 21:16:02.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.1-20190615+/doc/html/man/form.3x.html	2019-06-15 23:31:10.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/form.3x.html	2019-06-23 21:16:04.000000000 +0000
-@@ -246,7 +246,7 @@
-        curses(3x)  and  related  pages  whose names begin "form_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.1-20190615+/doc/html/man/infocmp.1m.html	2019-06-15 23:31:11.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/infocmp.1m.html	2019-06-23 21:16:04.000000000 +0000
-@@ -481,7 +481,7 @@
- 
-        https://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/infotocap.1m.html
---- ncurses-6.1-20190615+/doc/html/man/infotocap.1m.html	2019-06-15 23:31:11.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/infotocap.1m.html	2019-06-23 21:16:04.000000000 +0000
-@@ -85,7 +85,7 @@
-

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/menu.3x.html
---- ncurses-6.1-20190615+/doc/html/man/menu.3x.html	2019-06-15 23:31:11.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/menu.3x.html	2019-06-23 21:16:05.000000000 +0000
-@@ -221,7 +221,7 @@
-        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.1-20190615+/doc/html/man/ncurses.3x.html	2019-06-15 23:31:12.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/ncurses.3x.html	2019-06-23 21:16:05.000000000 +0000
-@@ -59,7 +59,7 @@
-        method of updating  character  screens  with  reasonable  optimization.
-        This  implementation  is  "new  curses"  (ncurses)  and is the approved
-        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
-        The  ncurses  library emulates the curses library of System V Release 4
-        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-Index: doc/html/man/ncurses6-config.1.html
---- ncurses-6.1-20190615+/doc/html/man/ncurses6-config.1.html	2019-06-15 23:31:12.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/ncurses6-config.1.html	2019-06-23 21:16:05.000000000 +0000
-@@ -112,7 +112,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.1-20190615+/doc/html/man/panel.3x.html	2019-06-15 23:31:12.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/panel.3x.html	2019-06-23 21:16:05.000000000 +0000
-@@ -204,7 +204,7 @@
-

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/tabs.1.html
---- ncurses-6.1-20190615+/doc/html/man/tabs.1.html	2019-06-15 23:31:12.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/tabs.1.html	2019-06-23 21:16:06.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tabs.1,v 1.25 2019/06/15 23:08:12 tom Exp @
-+  * @Id: tabs.1,v 1.26 2019/06/23 21:01:12 tom Exp @
- -->
- 
- 
-@@ -167,24 +167,28 @@
-        The  -d  (debug)  and -n (no-op) options are extensions not provided by
-        other implementations.
- 
--       A tabs utility appeared in PWB/Unix 1.0 (1977), and thereafter in  3BSD
--       (1979).  It supported a single "-n" option (to cause the first tab stop
-+       A tabs utility appeared in PWB/Unix 1.0 (1977).  There  was  a  reduced
-+       version  of  the  tabs  utility in Unix 7th edition and in 3BSD (1979).
-+       The latter supported a single "-n" option (to cause the first tab  stop
-        to be set on the left margin).  That option is not documented by POSIX.
--       Initially, tabs used built-in tables rather than the terminal database,
--       to support a half-dozen terminal types.  It also had built-in logic  to
--       support  the left-margin, as well as a feature for copying the tab set-
--       tings from a file.
--
--       Later versions of Unix, e.g., SVr4,  added  support  for  the  terminal
--       database,  but  kept the tables, as a fallback.  In an earlier develop-
--       ment effort, the tab-stop initialization provided by  tset  (1982)  and
-+
-+       The  PWB/Unix  tabs  utility,  which was included in System III (1980),
-+       used built-in tables rather than the terminal database,  to  support  a
-+       half-dozen  terminal  types.  It also had built-in logic to support the
-+       left-margin, as well as a feature for copying the tab settings  from  a
-+       file.
-+
-+       Later  versions  of  Unix,  e.g.,  SVr4, added support for the terminal
-+       database, but kept the tables, as a fallback.  In an  earlier  develop-
-+       ment  effort,  the  tab-stop initialization provided by tset (1982) and
-        incorporated into tput uses the terminal database,
- 
--       POSIX  documents  no  limits on the number of tab stops.  Documentation
-+       POSIX documents no limits on the number of  tab  stops.   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.
-+       tab stops (e.g., 20 in PWB/Unix's tabs utility).  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.
- 
-        The  Rationale section of the POSIX documentation goes into some detail
-        about the ways the committee considered redesigning the tabs  and  tput
-@@ -201,7 +205,7 @@
-

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.1-20190615+/doc/html/man/terminfo.5.html	2019-06-15 23:31:12.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/terminfo.5.html	2019-06-23 21:16:06.000000000 +0000
-@@ -74,7 +74,7 @@
-        Terminfo describes terminals by giving a set of capabilities which they
-        have, by specifying how to perform screen operations, and by specifying
-        padding  requirements  and  initialization  sequences.   This describes
--       ncurses version 6.1 (patch 20190615).
-+       ncurses version 6.1 (patch 20190623).
- 
- 
-

    Terminfo Entry Syntax

    -Index: doc/html/man/tic.1m.html
---- ncurses-6.1-20190615+/doc/html/man/tic.1m.html	2019-06-15 23:31:12.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/tic.1m.html	2019-06-23 21:16:06.000000000 +0000
-@@ -365,7 +365,7 @@
-        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-        term(5).  terminfo(5).  user_caps(5).
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/toe.1m.html
---- ncurses-6.1-20190615+/doc/html/man/toe.1m.html	2019-06-15 23:31:12.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/toe.1m.html	2019-06-23 21:16:06.000000000 +0000
-@@ -113,7 +113,7 @@
-        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
-        minfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.1-20190615+/doc/html/man/tput.1.html	2019-06-15 23:31:12.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/tput.1.html	2019-06-23 21:16:06.000000000 +0000
-@@ -522,7 +522,7 @@
-

    SEE ALSO

    -        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.1-20190615+/doc/html/man/tset.1.html	2019-06-15 23:31:12.000000000 +0000
-+++ ncurses-6.1-20190623/doc/html/man/tset.1.html	2019-06-23 21:16:06.000000000 +0000
-@@ -389,7 +389,7 @@
-        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
-        ttys(5), environ(7)
- 
--       This describes ncurses version 6.1 (patch 20190615).
-+       This describes ncurses version 6.1 (patch 20190623).
- 
- 
- 
-Index: include/nc_mingw.h
-Prereq:  1.5 
---- ncurses-6.1-20190615+/include/nc_mingw.h	2018-06-24 00:06:37.000000000 +0000
-+++ ncurses-6.1-20190623/include/nc_mingw.h	2019-06-23 19:55:08.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2008-2017,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2008-2018,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -30,7 +30,7 @@
-  * Author: Thomas Dickey, 2008-on                                           *
-  ****************************************************************************/
- 
--/* $Id: nc_mingw.h,v 1.5 2018/06/24 00:06:37 tom Exp $ */
-+/* $Id: nc_mingw.h,v 1.6 2019/06/23 19:55:08 tom Exp $ */
- 
- #ifndef NC_MINGW_H
- #define NC_MINGW_H 1
-@@ -63,7 +63,7 @@
- #define getlogin() "username"
- 
- #undef wcwidth
--#define wcwidth(ucs) _nc_wcwidth(ucs)
-+#define wcwidth(ucs) _nc_wcwidth((wchar_t)(ucs))
- extern int _nc_wcwidth(wchar_t);
- 
- #endif /* _WIN32 */
-Index: include/ncurses_defs
-Prereq:  1.90 
---- ncurses-6.1-20190615+/include/ncurses_defs	2019-04-13 22:52:57.000000000 +0000
-+++ ncurses-6.1-20190623/include/ncurses_defs	2019-06-23 15:19:43.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncurses_defs,v 1.90 2019/04/13 22:52:57 tom Exp $
-+# $Id: ncurses_defs,v 1.91 2019/06/23 15:19:43 tom Exp $
- ##############################################################################
- # Copyright (c) 2000-2018,2019 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -52,6 +52,7 @@
- HAVE_CHGAT	1
- HAVE_COLOR_CONTENT	1
- HAVE_COLOR_SET	1
-+HAVE_CONSISTENT_GETENV
- HAVE_COPYWIN	1
- HAVE_CURSCR	1
- HAVE_CURSES_DATA_TABSIZE	1
-Index: man/man_db.renames
-Prereq:  1.53 
---- ncurses-6.1-20190615+/man/man_db.renames	2019-01-21 09:25:24.000000000 +0000
-+++ ncurses-6.1-20190623/man/man_db.renames	2019-06-23 19:12:27.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: man_db.renames,v 1.53 2019/01/21 09:25:24 tom Exp $
-+# $Id: man_db.renames,v 1.54 2019/06/23 19:12:27 tom Exp $
- # Manual-page renamings for the man_db program
- #
- # Files:
-@@ -171,6 +171,7 @@
- wresize.3x			wresize.3ncurses
- #
- # Other:
-+tabs.1m				tabs.1
- tack.1m				tack.1
- #
- getty.1				getty.8
-Index: man/tabs.1
-Prereq:  1.25 
---- ncurses-6.1-20190615+/man/tabs.1	2019-06-15 23:08:12.000000000 +0000
-+++ ncurses-6.1-20190623/man/tabs.1	2019-06-23 21:01:12.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tabs.1,v 1.25 2019/06/15 23:08:12 tom Exp $
-+.\" $Id: tabs.1,v 1.26 2019/06/23 21:01:12 tom Exp $
- .TH @TABS@ 1 ""
- .ds n 5
- .ie \n(.g .ds `` \(lq
-@@ -185,12 +185,15 @@
- The \fB\-d\fP (debug) and \fB\-n\fP (no-op) options are extensions not provided
- by other implementations.
- .PP
--A \fBtabs\fP utility appeared in PWB/Unix 1.0 (1977),
--and thereafter in 3BSD (1979).
--It supported a single \*(``\-n\*('' option
-+A \fBtabs\fP utility appeared in PWB/Unix 1.0 (1977).
-+There was a reduced version of the \fBtabs\fP utility
-+in Unix 7th edition and in 3BSD (1979).
-+The latter supported a single \*(``\-n\*('' option
- (to cause the first tab stop to be set on the left margin).
- That option is not documented by POSIX.
--Initially, \fBtabs\fP used built-in tables rather than the terminal database,
-+.PP
-+The PWB/Unix \fBtabs\fP utility, which was included in System III (1980),
-+used built-in tables rather than the terminal database,
- to support a half-dozen terminal types.
- It also had built-in logic to support the left-margin,
- as well as a feature for copying the tab settings from a file.
-@@ -204,7 +207,8 @@
- .PP
- POSIX documents no limits on the number of tab stops.
- Documentation for other implementations states that there is a limit on the
--number of tab stops.
-+number of tab stops
-+(e.g., 20 in PWB/Unix's \fBtabs\fP utility).
- 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.
-Index: ncurses/base/lib_initscr.c
-Prereq:  1.43 
---- ncurses-6.1-20190615+/ncurses/base/lib_initscr.c	2017-06-17 18:42:45.000000000 +0000
-+++ ncurses-6.1-20190623/ncurses/base/lib_initscr.c	2019-06-22 00:02:01.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2017,2019 Free 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: Zeyd M. Ben-Halim  1992,1995               *
-  *     and: Eric S. Raymond                          *
-- *     and: Thomas E. Dickey                        1996-2003               *
-+ *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
- /*
-@@ -45,7 +45,7 @@
- #include 		/* needed for ISC */
- #endif
- 
--MODULE_ID("$Id: lib_initscr.c,v 1.43 2017/06/17 18:42:45 tom Exp $")
-+MODULE_ID("$Id: lib_initscr.c,v 1.44 2019/06/22 00:02:01 tom Exp $")
- 
- NCURSES_EXPORT(WINDOW *)
- initscr(void)
-@@ -60,14 +60,18 @@
- 
-     /* Portable applications must not call initscr() more than once */
-     if (!_nc_globals.init_screen) {
--	NCURSES_CONST char *name;
-+	const char *env;
-+	char *name;
- 
- 	_nc_globals.init_screen = TRUE;
- 
--	if ((name = getenv("TERM")) == 0
--	    || *name == '\0') {
--	    static char unknown_name[] = "unknown";
--	    name = unknown_name;
-+	if ((env = getenv("TERM")) == 0
-+	    || *env == '\0') {
-+	    env = "unknown";
-+	}
-+	if ((name = strdup(env)) == NULL) {
-+	    fprintf(stderr, "Error opening allocating $TERM.\n");
-+	    ExitProgram(EXIT_FAILURE);
- 	}
- #ifdef __CYGWIN__
- 	/*
-@@ -97,6 +101,7 @@
- #else
- 	def_prog_mode();
- #endif
-+	free(name);
-     }
-     result = stdscr;
-     _nc_unlock_global(curses);
-Index: ncurses/curses.priv.h
-Prereq:  1.623 
---- ncurses-6.1-20190615+/ncurses/curses.priv.h	2019-06-01 23:41:36.000000000 +0000
-+++ ncurses-6.1-20190623/ncurses/curses.priv.h	2019-06-23 15:20:49.000000000 +0000
-@@ -34,7 +34,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: curses.priv.h,v 1.623 2019/06/01 23:41:36 tom Exp $
-+ * $Id: curses.priv.h,v 1.624 2019/06/23 15:20:49 tom Exp $
-  *
-  *	curses.priv.h
-  *
-@@ -1766,12 +1766,16 @@
- #define TPUTS_TRACE(s)	_nc_tputs_trace = s;
- #endif
- 
-+#ifdef HAVE_CONSISTENT_GETENV
- #define START_TRACE() \
- 	if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \
- 	    int t = _nc_getenv_num("NCURSES_TRACE"); \
- 	    if (t >= 0) \
- 		trace((unsigned) t); \
- 	}
-+#else
-+#define START_TRACE() /* nothing */
-+#endif
- 
- /*
-  * Many of the _tracef() calls use static buffers; lock the trace state before
-Index: ncurses/tinfo/lib_acs.c
-Prereq:  1.48 
---- ncurses-6.1-20190615+/ncurses/tinfo/lib_acs.c	2019-05-04 23:03:08.000000000 +0000
-+++ ncurses-6.1-20190623/ncurses/tinfo/lib_acs.c	2019-06-23 16:22:10.000000000 +0000
-@@ -39,7 +39,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_acs.c,v 1.48 2019/05/04 23:03:08 tom Exp $")
-+MODULE_ID("$Id: lib_acs.c,v 1.49 2019/06/23 16:22:10 tom Exp $")
- 
- #if BROKEN_LINKER || USE_REENTRANT
- #define MyBuffer _nc_prescreen.real_acs_map
-@@ -317,7 +317,7 @@
- 	result = 1;
- 	break;
-     default:
--	result = (wcwidth) (ch);
-+	result = wcwidth(ch);
- 	break;
-     }
-     return result;
-Index: ncurses/tinfo/lib_setup.c
-Prereq:  1.199 
---- ncurses-6.1-20190615+/ncurses/tinfo/lib_setup.c	2019-03-23 23:42:20.000000000 +0000
-+++ ncurses-6.1-20190623/ncurses/tinfo/lib_setup.c	2019-06-22 00:15:32.000000000 +0000
-@@ -48,7 +48,7 @@
- #include 
- #endif
- 
--MODULE_ID("$Id: lib_setup.c,v 1.199 2019/03/23 23:42:20 tom Exp $")
-+MODULE_ID("$Id: lib_setup.c,v 1.200 2019/06/22 00:15:32 tom Exp $")
- 
- /****************************************************************************
-  *
-@@ -628,6 +628,7 @@
- #endif
-     TERMINAL *termp;
-     SCREEN *sp = 0;
-+    char *myname;
-     int code = ERR;
- 
-     START_TRACE();
-@@ -656,14 +657,15 @@
- #endif
- 	}
-     }
-+    myname = strdup(tname);
- 
--    if (strlen(tname) > MAX_NAME_SIZE) {
-+    if (strlen(myname) > MAX_NAME_SIZE) {
- 	ret_error(TGETENT_ERR,
- 		  "TERM environment must be <= %d characters.\n",
- 		  MAX_NAME_SIZE);
-     }
- 
--    T(("your terminal name is %s", tname));
-+    T(("your terminal name is %s", myname));
- 
-     /*
-      * Allow output redirection.  This is what SVr3 does.  If stdout is
-@@ -692,8 +694,8 @@
- 	&& (termp != 0)
- 	&& termp->Filedes == Filedes
- 	&& termp->_termname != 0
--	&& !strcmp(termp->_termname, tname)
--	&& _nc_name_match(TerminalType(termp).term_names, tname, "|")) {
-+	&& !strcmp(termp->_termname, myname)
-+	&& _nc_name_match(TerminalType(termp).term_names, myname, "|")) {
- 	T(("reusing existing terminal information and mode-settings"));
- 	code = OK;
- #ifdef USE_TERM_DRIVER
-@@ -735,17 +737,17 @@
- #ifdef USE_TERM_DRIVER
- 	INIT_TERM_DRIVER();
- 	TCB = (TERMINAL_CONTROL_BLOCK *) termp;
--	code = _nc_globals.term_driver(TCB, tname, errret);
-+	code = _nc_globals.term_driver(TCB, myname, errret);
- 	if (code == OK) {
- 	    termp->Filedes = (short) Filedes;
--	    termp->_termname = strdup(tname);
-+	    termp->_termname = strdup(myname);
- 	} else {
- 	    ret_error0(errret ? *errret : TGETENT_ERR,
- 		       "Could not find any driver to handle this terminal.\n");
- 	}
- #else
- #if NCURSES_USE_DATABASE || NCURSES_USE_TERMCAP
--	status = _nc_setup_tinfo(tname, &TerminalType(termp));
-+	status = _nc_setup_tinfo(myname, &TerminalType(termp));
- 	T(("_nc_setup_tinfo returns %d", status));
- #else
- 	T(("no database available"));
-@@ -754,7 +756,7 @@
- 
- 	/* try fallback list if entry on disk */
- 	if (status != TGETENT_YES) {
--	    const TERMTYPE2 *fallback = _nc_fallback2(tname);
-+	    const TERMTYPE2 *fallback = _nc_fallback2(myname);
- 
- 	    if (fallback) {
- 		T(("found fallback entry"));
-@@ -768,7 +770,7 @@
- 	    if (status == TGETENT_ERR) {
- 		ret_error0(status, "terminals database is inaccessible\n");
- 	    } else if (status == TGETENT_NO) {
--		ret_error1(status, "unknown terminal type.\n", tname);
-+		ret_error1(status, "unknown terminal type.\n", myname);
- 	    }
- 	}
- #if NCURSES_EXT_NUMBERS
-@@ -779,7 +781,7 @@
- #endif
- 
- 	termp->Filedes = (short) Filedes;
--	termp->_termname = strdup(tname);
-+	termp->_termname = strdup(myname);
- 
- 	set_curterm(termp);
- 
-@@ -826,15 +828,16 @@
- 	if ((VALID_STRING(cursor_address)
- 	     || (VALID_STRING(cursor_down) && VALID_STRING(cursor_home)))
- 	    && VALID_STRING(clear_screen)) {
--	    ret_error1(TGETENT_YES, "terminal is not really generic.\n", tname);
-+	    ret_error1(TGETENT_YES, "terminal is not really generic.\n", myname);
- 	} else {
- 	    del_curterm(termp);
--	    ret_error1(TGETENT_NO, "I need something more specific.\n", tname);
-+	    ret_error1(TGETENT_NO, "I need something more specific.\n", myname);
- 	}
-     } else if (hard_copy) {
--	ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname);
-+	ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", myname);
-     }
- #endif
-+    free(myname);
-     returnCode(code);
- }
- 
-Index: ncurses/tty/tty_update.c
-Prereq:  1.303 
---- ncurses-6.1-20190615+/ncurses/tty/tty_update.c	2019-06-01 23:42:36.000000000 +0000
-+++ ncurses-6.1-20190623/ncurses/tty/tty_update.c	2019-06-23 16:22:17.000000000 +0000
-@@ -84,7 +84,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: tty_update.c,v 1.303 2019/06/01 23:42:36 tom Exp $")
-+MODULE_ID("$Id: tty_update.c,v 1.304 2019/06/23 16:22:17 tom Exp $")
- 
- /*
-  * This define controls the line-breakout optimization.  Every once in a
-@@ -210,7 +210,7 @@
- }
- 
- #if !NCURSES_WCWIDTH_GRAPHICS
--#define is_wacs_value(ch) (_nc_wacs_width(ch) == 1 && (wcwidth)(ch) > 1)
-+#define is_wacs_value(ch) (_nc_wacs_width(ch) == 1 && wcwidth(ch) > 1)
- #endif /* !NCURSES_WCWIDTH_GRAPHICS */
- 
- static NCURSES_INLINE void
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20190615+/package/debian-mingw/changelog	2019-06-15 12:46:35.000000000 +0000
-+++ ncurses-6.1-20190623/package/debian-mingw/changelog	2019-06-23 15:31:40.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190615) unstable; urgency=low
-+ncurses6 (6.1+20190623) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
-+ -- Thomas E. Dickey   Sun, 23 Jun 2019 11:31:40 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20190615+/package/debian-mingw64/changelog	2019-06-15 12:46:35.000000000 +0000
-+++ ncurses-6.1-20190623/package/debian-mingw64/changelog	2019-06-23 15:31:40.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190615) unstable; urgency=low
-+ncurses6 (6.1+20190623) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
-+ -- Thomas E. Dickey   Sun, 23 Jun 2019 11:31:40 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20190615+/package/debian/changelog	2019-06-15 12:46:35.000000000 +0000
-+++ ncurses-6.1-20190623/package/debian/changelog	2019-06-23 15:31:40.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190615) unstable; urgency=low
-+ncurses6 (6.1+20190623) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 15 Jun 2019 08:46:35 -0400
-+ -- Thomas E. Dickey   Sun, 23 Jun 2019 11:31:40 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.334 
---- ncurses-6.1-20190615+/package/mingw-ncurses.nsi	2019-06-15 12:46:35.000000000 +0000
-+++ ncurses-6.1-20190623/package/mingw-ncurses.nsi	2019-06-23 15:31:40.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.334 2019/06/15 12:46:35 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.336 2019/06/23 15:31:40 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "0615"
-+!define VERSION_MMDD  "0623"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20190615+/package/mingw-ncurses.spec	2019-06-15 12:46:35.000000000 +0000
-+++ ncurses-6.1-20190623/package/mingw-ncurses.spec	2019-06-23 15:31:40.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20190615
-+Release: 20190623
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20190615+/package/ncurses.spec	2019-06-15 12:46:35.000000000 +0000
-+++ ncurses-6.1-20190623/package/ncurses.spec	2019-06-23 15:31:40.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20190615
-+Release: 20190623
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20190615+/package/ncursest.spec	2019-06-15 12:46:35.000000000 +0000
-+++ ncurses-6.1-20190623/package/ncursest.spec	2019-06-23 15:31:40.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20190615
-+Release: 20190623
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/test_sgr.c
-Prereq:  1.11 
---- ncurses-6.1-20190615+/test/test_sgr.c	2017-06-24 18:35:25.000000000 +0000
-+++ ncurses-6.1-20190623/test/test_sgr.c	2019-06-22 00:20:06.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2015-2016,2017 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2015-2017,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,7 +29,7 @@
- /*
-  * Author: Thomas E. Dickey
-  *
-- * $Id: test_sgr.c,v 1.11 2017/06/24 18:35:25 tom Exp $
-+ * $Id: test_sgr.c,v 1.12 2019/06/22 00:20:06 tom Exp $
-  *
-  * A simple demo of the sgr/sgr0 terminal capabilities.
-  */
-@@ -182,22 +182,23 @@
-     char *my_bold;
-     char *my_revs;
-     char *my_smso;
-+    char *my_name = strdup(name);
- 
-     if (db_list) {
- 	putenv(next_dbitem());
-     }
- 
-     if (!q_opt)
--	printf("Terminal type \"%s\"\n", name);
-+	printf("Terminal type \"%s\"\n", my_name);
- 
-     if (no_init) {
- 	START_TRACE();
-     } else {
--	setupterm((NCURSES_CONST char *) name, 1, (int *) 0);
-+	setupterm((NCURSES_CONST char *) my_name, 1, (int *) 0);
-     }
- 
-     if (!q_opt) {
--	if (strcmp(name, ttytype))
-+	if (strcmp(my_name, ttytype))
- 	    printf("... actual \"%s\"\n", ttytype);
-     }
- 
diff --git a/ncurses-6.1-20190630.patch b/ncurses-6.1-20190630.patch
deleted file mode 100644
index 049994e..0000000
--- a/ncurses-6.1-20190630.patch
+++ /dev/null
@@ -1,17671 +0,0 @@
-# ncurses 6.1 - patch 20190630 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190630.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jun 30 23:48:04 UTC 2019
-# ------------------------------------------------------------------------------
-# INSTALL                          |   18 
-# NEWS                             |   11 
-# VERSION                          |    2 
-# aclocal.m4                       |   73 
-# configure                        | 4805 +++++++++++++++++++------------------
-# configure.in                     |   30 
-# dist.mk                          |    4 
-# misc/run_tic.in                  |    6 
-# misc/terminfo.src                |  855 +++---
-# ncurses/Makefile.in              |    7 
-# ncurses/tinfo/MKfallback.sh      |   11 
-# ncurses/tinfo/write_entry.c      |    7 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw/rules       |    2 
-# package/debian-mingw64/changelog |    4 
-# package/debian-mingw64/rules     |    2 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    7 
-# package/ncurses.spec             |    2 
-# package/ncursest.spec            |    2 
-# progs/tic.c                      |    7 
-# 22 files changed, 3173 insertions(+), 2694 deletions(-)
-# ------------------------------------------------------------------------------
-Index: INSTALL
-Prereq:  1.212 
---- ncurses-6.1-20190623+/INSTALL	2019-01-19 17:42:30.000000000 +0000
-+++ ncurses-6.1-20190630/INSTALL	2019-06-30 15:28:56.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: INSTALL,v 1.212 2019/01/19 17:42:30 tom Exp $
-+-- $Id: INSTALL,v 1.213 2019/06/30 15:28:56 tom Exp $
- ---------------------------------------------------------------------
-              How to install Ncurses/Terminfo on your system
- ---------------------------------------------------------------------
-@@ -903,6 +903,8 @@
- 	Specify a list of fallback terminal descriptions which will be
- 	compiled into the ncurses library.  See CONFIGURING FALLBACK ENTRIES.
- 
-+	See also "--with-tic-path" and "--with-infocmp-path".
-+
-     --with-gpm
- 	use Alessandro Rubini's GPM library to provide mouse support on the
- 	Linux console.  Prior to ncurses 5.5, this introduced a dependency on
-@@ -954,6 +956,10 @@
- 
- 	See also the --enable-getcap option.
- 
-+    --with-infocmp-path[=XXX]
-+	Use this option to override the automatic detection of tic in your
-+	$PATH when building fallbacks (see "--with-fallbacks").
-+
-     --with-install-prefix=XXX
- 	Allows you to specify an alternate location for installing ncurses
- 	after building it.  The value you specify is prepended to the "real"
-@@ -1173,6 +1179,10 @@
- 	Specify a search-list of termcap files which will be compiled into the
- 	ncurses library (default:  /etc/termcap:/usr/share/misc/termcap)
- 
-+    --with-tic-path[=XXX]
-+	Use this option to override the automatic detection of tic in your
-+	$PATH when building fallbacks (see "--with-fallbacks").
-+
-     --with-ticlib[=XXX]
- 	When building the ncurses library, build a separate library for
- 	the modules that are used only by the utility programs.  Normally
-@@ -2120,9 +2130,10 @@
- 			$TERMINFO \
- 			../misc/terminfo.src \
- 			`which tic` \
-+			`which infocmp` \
- 			linux vt100 xterm >fallback.c
- 
--	The first three parameters of the script are normally supplied by
-+	The first four parameters of the script are normally supplied by
- 	the configured makefiles via the "--with-fallbacks" option.  They
- 	are
- 
-@@ -2130,6 +2141,8 @@
- 		2) the source for the terminfo entries
- 		3) the location of the tic program, used to create a terminfo
- 		   database.
-+		4) the location of the infocmp program, used to print a terminfo
-+		   description.
- 
- 	Then just rebuild and reinstall the library as you would normally.
- 	You can restore the default empty fallback list with
-@@ -2138,6 +2151,7 @@
- 			$TERMINFO \
- 			../misc/terminfo.src \
- 			`which tic` \
-+			`which infocmp` \
- 			>fallback.c
- 
- 	The overhead for an empty fallback list is one trivial stub function.
-Index: NEWS
-Prereq:  1.3337 
---- ncurses-6.1-20190623+/NEWS	2019-06-23 21:18:23.000000000 +0000
-+++ ncurses-6.1-20190630/NEWS	2019-06-30 10:45:10.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3337 2019/06/23 21:18:23 tom Exp $
-+-- $Id: NEWS,v 1.3342 2019/06/30 10:45:10 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,15 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20190630
-+	+ add --with-tic-path and --with-infocmp-path to work around problems
-+	  building fallback source using pre-6.0 tic/infocmp.
-+	+ add a check in tic for paired indn/rin
-+	+ correct a buffer-limit in write_entry.c for systems that use caseless
-+	  filenames.
-+	+ add ms-terminal -TD
-+	+ add vscode, vscode-direct -TD
-+
- 20190623
- 	+ improve the tabs.1 manual page to distinguish the PWB/Unix and 7th
- 	  Edition versions of the tabs utility.
-Index: VERSION
---- ncurses-6.1-20190623+/VERSION	2019-06-23 15:31:40.000000000 +0000
-+++ ncurses-6.1-20190630/VERSION	2019-06-30 01:30:19.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20190623
-+5:0:10	6.1	20190630
-Index: aclocal.m4
-Prereq:  1.869 
---- ncurses-6.1-20190623+/aclocal.m4	2019-06-23 19:53:31.000000000 +0000
-+++ ncurses-6.1-20190630/aclocal.m4	2019-06-30 23:46:29.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.869 2019/06/23 19:53:31 tom Exp $
-+dnl $Id: aclocal.m4,v 1.876 2019/06/30 23:46:29 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -5606,6 +5606,51 @@
- 	AC_MSG_RESULT($PATH_SEPARATOR)
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_PATH_PROG version: 10 updated: 2019/06/30 19:44:43
-+dnl ------------
-+dnl Check for a given program, defining corresponding symbol.
-+dnl	$1 = environment variable, which is suffixed by "_PATH" in the #define.
-+dnl	$2 = program name to find.
-+dnl	$3 = optional list of additional program names to test.
-+dnl $4 = $PATH
-+dnl
-+dnl If there is more than one token in the result, #define the remaining tokens
-+dnl to $1_ARGS.  We need this for 'install' in particular.
-+dnl
-+dnl FIXME: we should allow this to be overridden by environment variables
-+dnl
-+AC_DEFUN([CF_PATH_PROG],[
-+AC_REQUIRE([CF_PATHSEP])
-+test -z "[$]$1" && $1=$2
-+AC_PATH_PROGS($1,[$]$1 $2 ifelse($3,,,$3),[$]$1, ifelse($4,,,$4))
-+
-+cf_path_prog=""
-+cf_path_args=""
-+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
-+for cf_temp in $ac_cv_path_$1
-+do
-+	if test -z "$cf_path_prog" ; then
-+		if test "$with_full_paths" = yes ; then
-+			CF_PATH_SYNTAX(cf_temp,break)
-+			cf_path_prog="$cf_temp"
-+		else
-+			cf_path_prog="`basename $cf_temp`"
-+		fi
-+	elif test -z "$cf_path_args" ; then
-+		cf_path_args="$cf_temp"
-+	else
-+		cf_path_args="$cf_path_args $cf_temp"
-+	fi
-+done
-+IFS="$cf_save_ifs"
-+
-+if test -n "$cf_path_prog" ; then
-+	CF_MSG_LOG(defining path for ${cf_path_prog})
-+	AC_DEFINE_UNQUOTED($1_PATH,"$cf_path_prog",Define to pathname $1)
-+	test -n "$cf_path_args" && AC_DEFINE_UNQUOTED($1_ARGS,"$cf_path_args",Define to provide args for $1)
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_PATH_SYNTAX version: 16 updated: 2015/04/18 08:56:57
- dnl --------------
- dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
-@@ -8317,6 +8362,32 @@
- AC_SUBST(PKG_CONFIG_LIBDIR)
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_PATH_PROG version: 1 updated: 2019/06/30 19:44:43
-+dnl -----------------
-+dnl Check for a given program, like CF_PATH_PROG, but allow override using a
-+dnl "--with-xxx" option.
-+dnl
-+dnl Parameters:
-+dnl		$1 = environment variable to set/update
-+dnl		$2 = program name
-+dnl		$3 = help-text
-+dnl		$4 = $PATH
-+AC_DEFUN([CF_WITH_PATH_PROG],[
-+AC_ARG_WITH($2-path,
-+	[  --with-$2-path=XXX     specify path of $2 ifelse($3,,,$3)],
-+	[AC_MSG_CHECKING(for $2 program ifelse($3,,,$3))
-+		$1=$withval
-+		AC_MSG_RESULT([$]$1)
-+		CF_PATH_SYNTAX($1)
-+	],
-+	[CF_PATH_PROG($1,$2,,ifelse($4,,,$4))
-+		if test -z "[$]$1"
-+		then
-+			AC_MSG_WARN(no $2 program found ifelse($3,,,$3))
-+		fi
-+	])
-+])
-+dnl ---------------------------------------------------------------------------
- dnl CF_WITH_PTHREAD version: 7 updated: 2015/04/18 08:56:57
- dnl ---------------
- dnl Check for POSIX thread library.
-Index: configure
---- ncurses-6.1-20190623+/configure	2019-06-23 21:27:11.000000000 +0000
-+++ ncurses-6.1-20190630/configure	2019-06-30 15:34:11.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.682 .
-+# From configure.in Revision: 1.688 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20181006.
- #
-@@ -767,6 +767,8 @@
-   --with-database=XXX     specify terminfo source to install
-   --with-hashed-db        specify hashed-database library
-   --with-fallbacks=XXX    specify list of fallback terminal descriptions
-+  --with-tic-path=XXX     specify path of tic for fallbacks
-+  --with-infocmp-path=XXX     specify path of infocmp for fallbacks
-   --without-xterm-new     specify if xterm terminfo should be old version
-   --with-xterm-kbs=XXX    specify if xterm backspace sends BS or DEL
-   --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo)
-@@ -1053,7 +1055,7 @@
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
--    { echo "$as_me:1056: loading site script $ac_site_file" >&5
-+    { echo "$as_me:1058: 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"
-@@ -1064,7 +1066,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:1067: loading cache $cache_file" >&5
-+    { echo "$as_me:1069: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -1072,7 +1074,7 @@
-     esac
-   fi
- else
--  { echo "$as_me:1075: creating cache $cache_file" >&5
-+  { echo "$as_me:1077: creating cache $cache_file" >&5
- echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
-@@ -1088,21 +1090,21 @@
-   eval ac_new_val="\$ac_env_${ac_var}_value"
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { echo "$as_me:1091: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:1093: 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:1095: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:1097: 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:1101: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:1103: 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:1103:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:1105:   former value:  $ac_old_val" >&5
- echo "$as_me:   former value:  $ac_old_val" >&2;}
--        { echo "$as_me:1105:   current value: $ac_new_val" >&5
-+        { echo "$as_me:1107:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
-         ac_cache_corrupted=:
-       fi;;
-@@ -1121,9 +1123,9 @@
-   fi
- done
- if $ac_cache_corrupted; then
--  { echo "$as_me:1124: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:1126: 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:1126: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:1128: 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
-@@ -1144,10 +1146,10 @@
- echo "#! $SHELL" >conftest.sh
- echo  "exit 0"   >>conftest.sh
- chmod +x conftest.sh
--if { (echo "$as_me:1147: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:1149: PATH=\".;.\"; conftest.sh") >&5
-   (PATH=".;."; conftest.sh) 2>&5
-   ac_status=$?
--  echo "$as_me:1150: \$? = $ac_status" >&5
-+  echo "$as_me:1152: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   ac_path_separator=';'
- else
-@@ -1160,7 +1162,7 @@
- 
- top_builddir=`pwd`
- 
--echo "$as_me:1163: checking for egrep" >&5
-+echo "$as_me:1165: 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
-@@ -1170,11 +1172,11 @@
- 		else ac_cv_prog_egrep='egrep'
- 	fi
- fi
--echo "$as_me:1173: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:1175: 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:1177: error: No egrep program found" >&5
-+	test -z "$EGREP" && { { echo "$as_me:1179: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -1184,11 +1186,11 @@
- cf_cv_abi_version=${NCURSES_MAJOR}
- cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
- cf_cv_timestamp=`date`
--echo "$as_me:1187: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+echo "$as_me:1189: 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
- 
- if test -f $srcdir/VERSION ; then
--	echo "$as_me:1191: checking for package version" >&5
-+	echo "$as_me:1193: checking for package version" >&5
- echo $ECHO_N "checking for package version... $ECHO_C" >&6
- 
- 	# if there are not enough fields, cut returns the last one...
-@@ -1200,39 +1202,39 @@
- 	VERSION="$cf_field1"
- 
- 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
--	test -z "$VERSION_MAJOR" && { { echo "$as_me:1203: error: missing major-version" >&5
-+	test -z "$VERSION_MAJOR" && { { echo "$as_me:1205: error: missing major-version" >&5
- echo "$as_me: error: missing major-version" >&2;}
-    { (exit 1); exit 1; }; }
- 
- 	VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
--	test -z "$VERSION_MINOR" && { { echo "$as_me:1208: error: missing minor-version" >&5
-+	test -z "$VERSION_MINOR" && { { echo "$as_me:1210: error: missing minor-version" >&5
- echo "$as_me: error: missing minor-version" >&2;}
-    { (exit 1); exit 1; }; }
- 
--	echo "$as_me:1212: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
-+	echo "$as_me:1214: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
- echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
- 
--	echo "$as_me:1215: checking for package patch date" >&5
-+	echo "$as_me:1217: checking for package patch date" >&5
- echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
- 	VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
- 	case .$VERSION_PATCH in
- 	(.)
--		{ { echo "$as_me:1220: error: missing patch-date $VERSION_PATCH" >&5
-+		{ { echo "$as_me:1222: error: missing patch-date $VERSION_PATCH" >&5
- echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
- 	(.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
- 		;;
- 	(*)
--		{ { echo "$as_me:1227: error: illegal patch-date $VERSION_PATCH" >&5
-+		{ { echo "$as_me:1229: error: illegal patch-date $VERSION_PATCH" >&5
- echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
- 	esac
--	echo "$as_me:1232: result: $VERSION_PATCH" >&5
-+	echo "$as_me:1234: result: $VERSION_PATCH" >&5
- echo "${ECHO_T}$VERSION_PATCH" >&6
- else
--	{ { echo "$as_me:1235: error: did not find $srcdir/VERSION" >&5
-+	{ { echo "$as_me:1237: error: did not find $srcdir/VERSION" >&5
- echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1240,19 +1242,19 @@
- # show the actual data that we have for versions:
- test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
- 
--echo "${as_me:-configure}:1243: testing ABI VERSION $VERSION ..." 1>&5
-+echo "${as_me:-configure}:1245: testing ABI VERSION $VERSION ..." 1>&5
- 
- test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
- 
--echo "${as_me:-configure}:1247: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
-+echo "${as_me:-configure}:1249: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
- 
- test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
- 
--echo "${as_me:-configure}:1251: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
-+echo "${as_me:-configure}:1253: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
- 
- test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
- 
--echo "${as_me:-configure}:1255: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
-+echo "${as_me:-configure}:1257: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
- 
- 	cf_PACKAGE=NCURSES
- 	PACKAGE=ncurses
-@@ -1276,7 +1278,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:1279: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
-+  { echo "$as_me:1281: 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;
-@@ -1289,13 +1291,13 @@
-   ([0-9]*)
-  	;;
-   (*)
--	{ { echo "$as_me:1292: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
-+	{ { echo "$as_me:1294: 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:1298: error: Release major-version value is empty" >&5
-+  { { echo "$as_me:1300: error: Release major-version value is empty" >&5
- echo "$as_me: error: Release major-version value is empty" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1305,13 +1307,13 @@
-   ([0-9]*)
-  	;;
-   (*)
--	{ { echo "$as_me:1308: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
-+	{ { echo "$as_me:1310: 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:1314: error: Release minor-version value is empty" >&5
-+  { { echo "$as_me:1316: error: Release minor-version value is empty" >&5
- echo "$as_me: error: Release minor-version value is empty" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1324,7 +1326,7 @@
- 
- 	if test "x$cf_cv_abi_version" != "x$withval"
- 	then
--		{ echo "$as_me:1327: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
-+		{ echo "$as_me:1329: 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;}
- 		case $cf_cv_rel_version in
- 		(5.*)
-@@ -1343,13 +1345,13 @@
-   ([0-9]*)
-  	;;
-   (*)
--	{ { echo "$as_me:1346: error: ABI version is not a number: $cf_cv_abi_version" >&5
-+	{ { echo "$as_me:1348: 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:1352: error: ABI version value is empty" >&5
-+  { { echo "$as_me:1354: error: ABI version value is empty" >&5
- echo "$as_me: error: ABI version value is empty" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1380,7 +1382,7 @@
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:1383: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:1385: 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
-@@ -1390,11 +1392,11 @@
- 
- # Make sure we can run config.sub.
- $ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:1393: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:1395: error: cannot run $ac_config_sub" >&5
- echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:1397: checking build system type" >&5
-+echo "$as_me:1399: 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
-@@ -1403,23 +1405,23 @@
- test -z "$ac_cv_build_alias" &&
-   ac_cv_build_alias=`$ac_config_guess`
- test -z "$ac_cv_build_alias" &&
--  { { echo "$as_me:1406: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:1408: 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:1410: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:1412: 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:1415: result: $ac_cv_build" >&5
-+echo "$as_me:1417: 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:1422: checking host system type" >&5
-+echo "$as_me:1424: 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
-@@ -1428,12 +1430,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:1431: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1433: 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:1436: result: $ac_cv_host" >&5
-+echo "$as_me:1438: 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/'`
-@@ -1441,7 +1443,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:1444: checking target system type" >&5
-+	echo "$as_me:1446: 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
-@@ -1450,12 +1452,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:1453: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+  { { echo "$as_me:1455: 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:1458: result: $ac_cv_target" >&5
-+echo "$as_me:1460: 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/'`
-@@ -1487,13 +1489,13 @@
- fi
- 
- test -z "$system_name" && system_name="$cf_cv_system_name"
--test -n "$cf_cv_system_name" && echo "$as_me:1490: result: Configuring for $cf_cv_system_name" >&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1492: 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:1494: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+	echo "$as_me:1496: 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:1496: error: \"Please remove config.cache and try again.\"" >&5
-+	{ { echo "$as_me:1498: 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
-@@ -1501,7 +1503,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:1504: WARNING: overriding system type to $withval" >&5
-+  { echo "$as_me:1506: WARNING: overriding system type to $withval" >&5
- echo "$as_me: WARNING: overriding system type to $withval" >&2;}
- 	cf_cv_system_name=$withval
- 	host_os=$withval
-@@ -1513,7 +1515,7 @@
- 
- ###	Default install-location
- 
--echo "$as_me:1516: checking for prefix" >&5
-+echo "$as_me:1518: 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
-@@ -1525,11 +1527,11 @@
- 		;;
- 	esac
- fi
--echo "$as_me:1528: result: $prefix" >&5
-+echo "$as_me:1530: result: $prefix" >&5
- echo "${ECHO_T}$prefix" >&6
- 
- if test "x$prefix" = "xNONE" ; then
--echo "$as_me:1532: checking for default include-directory" >&5
-+echo "$as_me:1534: 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 \
-@@ -1552,7 +1554,7 @@
- 	fi
- 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
- done
--echo "$as_me:1555: result: $includedir" >&5
-+echo "$as_me:1557: result: $includedir" >&5
- echo "${ECHO_T}$includedir" >&6
- fi
- 
-@@ -1615,7 +1617,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:1618: checking for $ac_word" >&5
-+echo "$as_me:1620: 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
-@@ -1630,7 +1632,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:1633: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1635: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1638,10 +1640,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1641: result: $CC" >&5
-+  echo "$as_me:1643: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1644: result: no" >&5
-+  echo "$as_me:1646: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1654,7 +1656,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:1657: checking for $ac_word" >&5
-+echo "$as_me:1659: 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
-@@ -1669,7 +1671,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:1672: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1674: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1677,10 +1679,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1680: result: $ac_ct_CC" >&5
-+  echo "$as_me:1682: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1683: result: no" >&5
-+  echo "$as_me:1685: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1690,32 +1692,32 @@
-   CC=$ac_ct_CC
- fi
- 
--test -z "$CC" && { { echo "$as_me:1693: error: no acceptable cc found in \$PATH" >&5
-+test -z "$CC" && { { echo "$as_me:1695: 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:1698:" \
-+echo "$as_me:1700:" \
-      "checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:1701: \"$ac_compiler --version &5\"") >&5
-+{ (eval echo "$as_me:1703: \"$ac_compiler --version &5\"") >&5
-   (eval $ac_compiler --version &5) 2>&5
-   ac_status=$?
--  echo "$as_me:1704: \$? = $ac_status" >&5
-+  echo "$as_me:1706: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1706: \"$ac_compiler -v &5\"") >&5
-+{ (eval echo "$as_me:1708: \"$ac_compiler -v &5\"") >&5
-   (eval $ac_compiler -v &5) 2>&5
-   ac_status=$?
--  echo "$as_me:1709: \$? = $ac_status" >&5
-+  echo "$as_me:1711: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1711: \"$ac_compiler -V &5\"") >&5
-+{ (eval echo "$as_me:1713: \"$ac_compiler -V &5\"") >&5
-   (eval $ac_compiler -V &5) 2>&5
-   ac_status=$?
--  echo "$as_me:1714: \$? = $ac_status" >&5
-+  echo "$as_me:1716: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 1718 "configure"
-+#line 1720 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1731,13 +1733,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:1734: checking for C compiler default output" >&5
-+echo "$as_me:1736: 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:1737: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1739: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-   ac_status=$?
--  echo "$as_me:1740: \$? = $ac_status" >&5
-+  echo "$as_me:1742: \$? = $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
-@@ -1760,34 +1762,34 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1763: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:1765: 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:1769: result: $ac_file" >&5
-+echo "$as_me:1771: 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:1774: checking whether the C compiler works" >&5
-+echo "$as_me:1776: 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:1780: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1782: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1783: \$? = $ac_status" >&5
-+  echo "$as_me:1785: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:1790: error: cannot run C compiled programs.
-+	{ { echo "$as_me:1792: 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;}
-@@ -1795,24 +1797,24 @@
-     fi
-   fi
- fi
--echo "$as_me:1798: result: yes" >&5
-+echo "$as_me:1800: 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:1805: checking whether we are cross compiling" >&5
-+echo "$as_me:1807: checking whether we are cross compiling" >&5
- echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:1807: result: $cross_compiling" >&5
-+echo "$as_me:1809: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
- 
--echo "$as_me:1810: checking for executable suffix" >&5
-+echo "$as_me:1812: checking for executable suffix" >&5
- echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
--if { (eval echo "$as_me:1812: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1814: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:1815: \$? = $ac_status" >&5
-+  echo "$as_me:1817: \$? = $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
-@@ -1828,25 +1830,25 @@
-   esac
- done
- else
--  { { echo "$as_me:1831: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1833: 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:1837: result: $ac_cv_exeext" >&5
-+echo "$as_me:1839: 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:1843: checking for object suffix" >&5
-+echo "$as_me:1845: 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 1849 "configure"
-+#line 1851 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1858,10 +1860,10 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:1861: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1863: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1864: \$? = $ac_status" >&5
-+  echo "$as_me:1866: \$? = $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
-@@ -1873,24 +1875,24 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1876: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1878: 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:1883: result: $ac_cv_objext" >&5
-+echo "$as_me:1885: result: $ac_cv_objext" >&5
- echo "${ECHO_T}$ac_cv_objext" >&6
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:1887: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:1889: 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 1893 "configure"
-+#line 1895 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1905,16 +1907,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1908: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1910: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1911: \$? = $ac_status" >&5
-+  echo "$as_me:1913: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1914: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1916: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1917: \$? = $ac_status" >&5
-+  echo "$as_me:1919: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -1926,19 +1928,19 @@
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:1929: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1931: 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:1935: checking whether $CC accepts -g" >&5
-+echo "$as_me:1937: 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 1941 "configure"
-+#line 1943 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1950,16 +1952,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1953: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1955: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1956: \$? = $ac_status" >&5
-+  echo "$as_me:1958: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1959: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1961: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1962: \$? = $ac_status" >&5
-+  echo "$as_me:1964: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_g=yes
- else
-@@ -1969,7 +1971,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:1972: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:1974: 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
-@@ -1996,16 +1998,16 @@
- #endif
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1999: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2001: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2002: \$? = $ac_status" >&5
-+  echo "$as_me:2004: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2005: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2007: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2008: \$? = $ac_status" >&5
-+  echo "$as_me:2010: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
-    ''\
-@@ -2017,7 +2019,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2020 "configure"
-+#line 2022 "configure"
- #include "confdefs.h"
- #include 
- $ac_declaration
-@@ -2030,16 +2032,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2033: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2035: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2036: \$? = $ac_status" >&5
-+  echo "$as_me:2038: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2039: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2041: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2042: \$? = $ac_status" >&5
-+  echo "$as_me:2044: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -2049,7 +2051,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2052 "configure"
-+#line 2054 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -2061,16 +2063,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2064: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2067: \$? = $ac_status" >&5
-+  echo "$as_me:2069: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2070: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2072: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2073: \$? = $ac_status" >&5
-+  echo "$as_me:2075: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -2100,15 +2102,15 @@
- 
- GCC_VERSION=none
- if test "$GCC" = yes ; then
--	echo "$as_me:2103: checking version of $CC" >&5
-+	echo "$as_me:2105: checking version of $CC" >&5
- echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
- 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
- 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
--	echo "$as_me:2107: result: $GCC_VERSION" >&5
-+	echo "$as_me:2109: result: $GCC_VERSION" >&5
- echo "${ECHO_T}$GCC_VERSION" >&6
- fi
- 
--echo "$as_me:2111: checking for $CC option to accept ANSI C" >&5
-+echo "$as_me:2113: 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
-@@ -2116,7 +2118,7 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line 2119 "configure"
-+#line 2121 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -2165,16 +2167,16 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2170: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2171: \$? = $ac_status" >&5
-+  echo "$as_me:2173: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2174: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2176: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2177: \$? = $ac_status" >&5
-+  echo "$as_me:2179: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_stdc=$ac_arg
- break
-@@ -2191,10 +2193,10 @@
- 
- case "x$ac_cv_prog_cc_stdc" in
-   x|xno)
--    echo "$as_me:2194: result: none needed" >&5
-+    echo "$as_me:2196: result: none needed" >&5
- echo "${ECHO_T}none needed" >&6 ;;
-   *)
--    echo "$as_me:2197: result: $ac_cv_prog_cc_stdc" >&5
-+    echo "$as_me:2199: result: $ac_cv_prog_cc_stdc" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-     CC="$CC $ac_cv_prog_cc_stdc" ;;
- esac
-@@ -2202,13 +2204,13 @@
- # This should have been defined by AC_PROG_CC
- : ${CC:=cc}
- 
--echo "$as_me:2205: checking \$CFLAGS variable" >&5
-+echo "$as_me:2207: checking \$CFLAGS variable" >&5
- echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
- case "x$CFLAGS" in
- (*-[IUD]*)
--	echo "$as_me:2209: result: broken" >&5
-+	echo "$as_me:2211: result: broken" >&5
- echo "${ECHO_T}broken" >&6
--	{ echo "$as_me:2211: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
-+	{ echo "$as_me:2213: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
- echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
- 	cf_flags="$CFLAGS"
- 	CFLAGS=
-@@ -2316,18 +2318,18 @@
- 	done
- 	;;
- (*)
--	echo "$as_me:2319: result: ok" >&5
-+	echo "$as_me:2321: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- 	;;
- esac
- 
--echo "$as_me:2324: checking \$CC variable" >&5
-+echo "$as_me:2326: checking \$CC variable" >&5
- echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
- case "$CC" in
- (*[\ \	]-*)
--	echo "$as_me:2328: result: broken" >&5
-+	echo "$as_me:2330: result: broken" >&5
- echo "${ECHO_T}broken" >&6
--	{ echo "$as_me:2330: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
-+	{ echo "$as_me:2332: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
- echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
- 	# humor him...
- 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
-@@ -2444,19 +2446,19 @@
- 	done
- 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
- 
--echo "${as_me:-configure}:2447: testing resulting CC: '$CC' ..." 1>&5
-+echo "${as_me:-configure}:2449: testing resulting CC: '$CC' ..." 1>&5
- 
- 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
- 
--echo "${as_me:-configure}:2451: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
-+echo "${as_me:-configure}:2453: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
- 
- 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
- 
--echo "${as_me:-configure}:2455: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
-+echo "${as_me:-configure}:2457: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
- 
- 	;;
- (*)
--	echo "$as_me:2459: result: ok" >&5
-+	echo "$as_me:2461: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- 	;;
- esac
-@@ -2467,7 +2469,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:2470: checking how to run the C preprocessor" >&5
-+echo "$as_me:2472: 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
-@@ -2488,18 +2490,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 2491 "configure"
-+#line 2493 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2496: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2498: \"$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:2502: \$? = $ac_status" >&5
-+  echo "$as_me:2504: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2522,17 +2524,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2525 "configure"
-+#line 2527 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:2529: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2531: \"$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:2535: \$? = $ac_status" >&5
-+  echo "$as_me:2537: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2569,7 +2571,7 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:2572: result: $CPP" >&5
-+echo "$as_me:2574: result: $CPP" >&5
- echo "${ECHO_T}$CPP" >&6
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -2579,18 +2581,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 2582 "configure"
-+#line 2584 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2587: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2589: \"$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:2593: \$? = $ac_status" >&5
-+  echo "$as_me:2595: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2613,17 +2615,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2616 "configure"
-+#line 2618 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:2620: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2622: \"$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:2626: \$? = $ac_status" >&5
-+  echo "$as_me:2628: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2651,7 +2653,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:2654: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:2656: error: C preprocessor \"$CPP\" fails sanity check" >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -2664,14 +2666,14 @@
- ac_main_return=return
- 
- if test $ac_cv_c_compiler_gnu = yes; then
--    echo "$as_me:2667: checking whether $CC needs -traditional" >&5
-+    echo "$as_me:2669: 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 2674 "configure"
-+#line 2676 "configure"
- #include "confdefs.h"
- #include 
- int Autoconf = TIOCGETP;
-@@ -2686,7 +2688,7 @@
- 
-   if test $ac_cv_prog_gcc_traditional = no; then
-     cat >conftest.$ac_ext <<_ACEOF
--#line 2689 "configure"
-+#line 2691 "configure"
- #include "confdefs.h"
- #include 
- int Autoconf = TCGETA;
-@@ -2699,14 +2701,14 @@
- 
-   fi
- fi
--echo "$as_me:2702: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "$as_me:2704: 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:2709: checking whether $CC understands -c and -o together" >&5
-+echo "$as_me:2711: 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
-@@ -2721,15 +2723,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 $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:2724: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:2726: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2727: \$? = $ac_status" >&5
-+  echo "$as_me:2729: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:2729: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2731: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2732: \$? = $ac_status" >&5
-+  echo "$as_me:2734: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CC_c_o=yes
-@@ -2740,10 +2742,10 @@
- 
- fi
- if test $cf_cv_prog_CC_c_o = yes; then
--  echo "$as_me:2743: result: yes" >&5
-+  echo "$as_me:2745: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:2746: result: no" >&5
-+  echo "$as_me:2748: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2757,7 +2759,7 @@
- 	(*) 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:2760: checking for $ac_word" >&5
-+echo "$as_me:2762: 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
-@@ -2774,7 +2776,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:2777: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2779: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -2785,10 +2787,10 @@
- LDCONFIG=$ac_cv_path_LDCONFIG
- 
- if test -n "$LDCONFIG"; then
--  echo "$as_me:2788: result: $LDCONFIG" >&5
-+  echo "$as_me:2790: result: $LDCONFIG" >&5
- echo "${ECHO_T}$LDCONFIG" >&6
- else
--  echo "$as_me:2791: result: no" >&5
-+  echo "$as_me:2793: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2796,7 +2798,7 @@
- 	esac
- fi
- 
--echo "$as_me:2799: checking if you want to ensure bool is consistent with C++" >&5
-+echo "$as_me:2801: 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.
-@@ -2806,7 +2808,7 @@
- else
-   cf_with_cxx=yes
- fi;
--echo "$as_me:2809: result: $cf_with_cxx" >&5
-+echo "$as_me:2811: result: $cf_with_cxx" >&5
- echo "${ECHO_T}$cf_with_cxx" >&6
- if test "X$cf_with_cxx" = Xno ; then
- 	CXX=""
-@@ -2824,7 +2826,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:2827: checking for $ac_word" >&5
-+echo "$as_me:2829: 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
-@@ -2839,7 +2841,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:2842: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2844: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2847,10 +2849,10 @@
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  echo "$as_me:2850: result: $CXX" >&5
-+  echo "$as_me:2852: result: $CXX" >&5
- echo "${ECHO_T}$CXX" >&6
- else
--  echo "$as_me:2853: result: no" >&5
-+  echo "$as_me:2855: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2863,7 +2865,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:2866: checking for $ac_word" >&5
-+echo "$as_me:2868: 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
-@@ -2878,7 +2880,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:2881: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2883: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2886,10 +2888,10 @@
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  echo "$as_me:2889: result: $ac_ct_CXX" >&5
-+  echo "$as_me:2891: result: $ac_ct_CXX" >&5
- echo "${ECHO_T}$ac_ct_CXX" >&6
- else
--  echo "$as_me:2892: result: no" >&5
-+  echo "$as_me:2894: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2901,32 +2903,32 @@
- fi
- 
- # Provide some information about the compiler.
--echo "$as_me:2904:" \
-+echo "$as_me:2906:" \
-      "checking for C++ compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:2907: \"$ac_compiler --version &5\"") >&5
-+{ (eval echo "$as_me:2909: \"$ac_compiler --version &5\"") >&5
-   (eval $ac_compiler --version &5) 2>&5
-   ac_status=$?
--  echo "$as_me:2910: \$? = $ac_status" >&5
-+  echo "$as_me:2912: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:2912: \"$ac_compiler -v &5\"") >&5
-+{ (eval echo "$as_me:2914: \"$ac_compiler -v &5\"") >&5
-   (eval $ac_compiler -v &5) 2>&5
-   ac_status=$?
--  echo "$as_me:2915: \$? = $ac_status" >&5
-+  echo "$as_me:2917: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:2917: \"$ac_compiler -V &5\"") >&5
-+{ (eval echo "$as_me:2919: \"$ac_compiler -V &5\"") >&5
-   (eval $ac_compiler -V &5) 2>&5
-   ac_status=$?
--  echo "$as_me:2920: \$? = $ac_status" >&5
-+  echo "$as_me:2922: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--echo "$as_me:2923: checking whether we are using the GNU C++ compiler" >&5
-+echo "$as_me:2925: 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 2929 "configure"
-+#line 2931 "configure"
- #include "confdefs.h"
- 
- int
-@@ -2941,16 +2943,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2944: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2946: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2947: \$? = $ac_status" >&5
-+  echo "$as_me:2949: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2950: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2952: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2953: \$? = $ac_status" >&5
-+  echo "$as_me:2955: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -2962,19 +2964,19 @@
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:2965: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "$as_me:2967: 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:2971: checking whether $CXX accepts -g" >&5
-+echo "$as_me:2973: 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 2977 "configure"
-+#line 2979 "configure"
- #include "confdefs.h"
- 
- int
-@@ -2986,16 +2988,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2989: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2992: \$? = $ac_status" >&5
-+  echo "$as_me:2994: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2995: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2998: \$? = $ac_status" >&5
-+  echo "$as_me:3000: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cxx_g=yes
- else
-@@ -3005,7 +3007,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:3008: result: $ac_cv_prog_cxx_g" >&5
-+echo "$as_me:3010: 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
-@@ -3032,7 +3034,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3035 "configure"
-+#line 3037 "configure"
- #include "confdefs.h"
- #include 
- $ac_declaration
-@@ -3045,16 +3047,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3048: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3050: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3051: \$? = $ac_status" >&5
-+  echo "$as_me:3053: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3054: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3056: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3057: \$? = $ac_status" >&5
-+  echo "$as_me:3059: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -3064,7 +3066,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3067 "configure"
-+#line 3069 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -3076,16 +3078,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3079: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3081: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3082: \$? = $ac_status" >&5
-+  echo "$as_me:3084: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3085: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3087: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3088: \$? = $ac_status" >&5
-+  echo "$as_me:3090: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -3119,7 +3121,7 @@
- 	then
- 		# Several of the C++ configurations do not work, particularly when
- 		# cross-compiling (20140913 -TD)
--		echo "$as_me:3122: checking if $CXX works" >&5
-+		echo "$as_me:3124: checking if $CXX works" >&5
- echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
- 
- 		save_CPPFLAGS="$CPPFLAGS"
-@@ -3127,7 +3129,7 @@
- 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 3130 "configure"
-+#line 3132 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -3144,16 +3146,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3147: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3149: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3150: \$? = $ac_status" >&5
-+  echo "$as_me:3152: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3153: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3155: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3156: \$? = $ac_status" >&5
-+  echo "$as_me:3158: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_works=yes
- else
-@@ -3164,11 +3166,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CPPFLAGS="$save_CPPFLAGS"
- 
--		echo "$as_me:3167: result: $cf_cxx_works" >&5
-+		echo "$as_me:3169: result: $cf_cxx_works" >&5
- echo "${ECHO_T}$cf_cxx_works" >&6
- 		if test "x$cf_cxx_works" = xno
- 		then
--			{ echo "$as_me:3171: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
-+			{ echo "$as_me:3173: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
- echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
- 			cf_with_cxx=no; CXX=""; GXX="";
- 		fi
-@@ -3184,7 +3186,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:3187: checking for $ac_word" >&5
-+echo "$as_me:3189: 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
-@@ -3201,7 +3203,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:3204: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3206: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -3212,17 +3214,17 @@
- CXX=$ac_cv_path_CXX
- 
- if test -n "$CXX"; then
--  echo "$as_me:3215: result: $CXX" >&5
-+  echo "$as_me:3217: result: $CXX" >&5
- echo "${ECHO_T}$CXX" >&6
- else
--  echo "$as_me:3218: result: no" >&5
-+  echo "$as_me:3220: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 	fi
- 	case "x$CXX" in
- 	(x|xg++)
--		{ echo "$as_me:3225: WARNING: You don't have any C++ compiler, too bad" >&5
-+		{ echo "$as_me:3227: WARNING: You don't have any C++ compiler, too bad" >&5
- echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
- 		cf_with_cxx=no; CXX=""; GXX="";
- 		;;
-@@ -3231,7 +3233,7 @@
- 
- GXX_VERSION=none
- if test "$GXX" = yes; then
--	echo "$as_me:3234: checking version of ${CXX:-g++}" >&5
-+	echo "$as_me:3236: checking version of ${CXX:-g++}" >&5
- echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
- 	GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
- 	if test -z "$GXX_VERSION"
-@@ -3239,7 +3241,7 @@
- 		GXX_VERSION=unknown
- 		GXX=no
- 	fi
--	echo "$as_me:3242: result: $GXX_VERSION" >&5
-+	echo "$as_me:3244: result: $GXX_VERSION" >&5
- echo "${ECHO_T}$GXX_VERSION" >&6
- fi
- 
-@@ -3247,12 +3249,12 @@
- (1*|2.[0-6]*)
- 	# GXX=""; CXX=""; ac_cv_prog_gxx=no
- 	# cf_cxx_library=no
--	{ echo "$as_me:3250: WARNING: templates do not work" >&5
-+	{ echo "$as_me:3252: WARNING: templates do not work" >&5
- echo "$as_me: WARNING: templates do not work" >&2;}
- 	;;
- esac
- 
--echo "$as_me:3255: checking if you want to build C++ binding and demo" >&5
-+echo "$as_me:3257: 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.
-@@ -3262,15 +3264,15 @@
- else
-   cf_with_cxx_binding=$cf_with_cxx
- fi;
--echo "$as_me:3265: result: $cf_with_cxx_binding" >&5
-+echo "$as_me:3267: result: $cf_with_cxx_binding" >&5
- echo "${ECHO_T}$cf_with_cxx_binding" >&6
- 
--echo "$as_me:3268: checking if you want to build with Ada95" >&5
-+echo "$as_me:3270: checking if you want to build with Ada95" >&5
- echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
--echo "$as_me:3270: result: $cf_with_ada" >&5
-+echo "$as_me:3272: result: $cf_with_ada" >&5
- echo "${ECHO_T}$cf_with_ada" >&6
- 
--echo "$as_me:3273: checking if you want to install terminal database" >&5
-+echo "$as_me:3275: checking if you want to install terminal database" >&5
- echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
- 
- # Check whether --enable-db-install or --disable-db-install was given.
-@@ -3280,10 +3282,10 @@
- else
-   cf_with_db_install=yes
- fi;
--echo "$as_me:3283: result: $cf_with_db_install" >&5
-+echo "$as_me:3285: result: $cf_with_db_install" >&5
- echo "${ECHO_T}$cf_with_db_install" >&6
- 
--echo "$as_me:3286: checking if you want to install manpages" >&5
-+echo "$as_me:3288: 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.
-@@ -3293,10 +3295,10 @@
- else
-   cf_with_manpages=yes
- fi;
--echo "$as_me:3296: result: $cf_with_manpages" >&5
-+echo "$as_me:3298: result: $cf_with_manpages" >&5
- echo "${ECHO_T}$cf_with_manpages" >&6
- 
--echo "$as_me:3299: checking if you want to build programs such as tic" >&5
-+echo "$as_me:3301: 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.
-@@ -3306,18 +3308,18 @@
- else
-   cf_with_progs=yes
- fi;
--echo "$as_me:3309: result: $cf_with_progs" >&5
-+echo "$as_me:3311: result: $cf_with_progs" >&5
- echo "${ECHO_T}$cf_with_progs" >&6
- 
- if test -f $srcdir/tack/tack.h; then
- 	if test "x$cross_compiling" = xyes ; then
- 		test -n "$verbose" && echo "	ignoring tack because we are cross-compiling" 1>&6
- 
--echo "${as_me:-configure}:3316: testing ignoring tack because we are cross-compiling ..." 1>&5
-+echo "${as_me:-configure}:3318: testing ignoring tack because we are cross-compiling ..." 1>&5
- 
- 		cf_with_tack=no
- 	else
--		echo "$as_me:3320: checking if you want to build the tack program" >&5
-+		echo "$as_me:3322: checking if you want to build the tack program" >&5
- echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6
- 
- # Check whether --with-tack or --without-tack was given.
-@@ -3327,14 +3329,14 @@
- else
-   cf_with_tack=$cf_with_progs
- fi;
--		echo "$as_me:3330: result: $cf_with_tack" >&5
-+		echo "$as_me:3332: result: $cf_with_tack" >&5
- echo "${ECHO_T}$cf_with_tack" >&6
- 	fi
- else
- 	cf_with_tack=no
- fi
- 
--echo "$as_me:3337: checking if you want to build test-programs" >&5
-+echo "$as_me:3339: checking if you want to build test-programs" >&5
- echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
- 
- # Check whether --with-tests or --without-tests was given.
-@@ -3344,10 +3346,10 @@
- else
-   cf_with_tests=yes
- fi;
--echo "$as_me:3347: result: $cf_with_tests" >&5
-+echo "$as_me:3349: result: $cf_with_tests" >&5
- echo "${ECHO_T}$cf_with_tests" >&6
- 
--echo "$as_me:3350: checking if you wish to install curses.h" >&5
-+echo "$as_me:3352: 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.
-@@ -3357,7 +3359,7 @@
- else
-   with_curses_h=yes
- fi;
--echo "$as_me:3360: result: $with_curses_h" >&5
-+echo "$as_me:3362: result: $with_curses_h" >&5
- echo "${ECHO_T}$with_curses_h" >&6
- 
- modules_to_build="ncurses"
-@@ -3382,7 +3384,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:3385: checking for $ac_word" >&5
-+echo "$as_me:3387: 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
-@@ -3397,7 +3399,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AWK="$ac_prog"
--echo "$as_me:3400: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3402: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3405,21 +3407,21 @@
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:3408: result: $AWK" >&5
-+  echo "$as_me:3410: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
--  echo "$as_me:3411: result: no" >&5
-+  echo "$as_me:3413: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$AWK" && break
- done
- 
--test -z "$AWK" && { { echo "$as_me:3418: error: No awk program found" >&5
-+test -z "$AWK" && { { echo "$as_me:3420: error: No awk program found" >&5
- echo "$as_me: error: No awk program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:3422: checking for egrep" >&5
-+echo "$as_me:3424: 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
-@@ -3429,11 +3431,11 @@
- 		else ac_cv_prog_egrep='egrep'
- 	fi
- fi
--echo "$as_me:3432: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:3434: 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:3436: error: No egrep program found" >&5
-+	test -z "$EGREP" && { { echo "$as_me:3438: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -3449,7 +3451,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:3452: checking for a BSD compatible install" >&5
-+echo "$as_me:3454: 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
-@@ -3498,7 +3500,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:3501: result: $INSTALL" >&5
-+echo "$as_me:3503: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -3523,7 +3525,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:3526: checking for $ac_word" >&5
-+echo "$as_me:3528: 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
-@@ -3538,7 +3540,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LINT="$ac_prog"
--echo "$as_me:3541: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3543: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3546,28 +3548,28 @@
- fi
- LINT=$ac_cv_prog_LINT
- if test -n "$LINT"; then
--  echo "$as_me:3549: result: $LINT" >&5
-+  echo "$as_me:3551: result: $LINT" >&5
- echo "${ECHO_T}$LINT" >&6
- else
--  echo "$as_me:3552: result: no" >&5
-+  echo "$as_me:3554: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$LINT" && break
- done
- 
--echo "$as_me:3559: checking whether ln -s works" >&5
-+echo "$as_me:3561: 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:3563: result: yes" >&5
-+  echo "$as_me:3565: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:3566: result: no, using $LN_S" >&5
-+  echo "$as_me:3568: result: no, using $LN_S" >&5
- echo "${ECHO_T}no, using $LN_S" >&6
- fi
- 
--echo "$as_me:3570: checking if $LN_S -f options work" >&5
-+echo "$as_me:3572: checking if $LN_S -f options work" >&5
- echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
- 
- rm -f conf$$.src conf$$dst
-@@ -3579,12 +3581,12 @@
- 	cf_prog_ln_sf=no
- fi
- rm -f conf$$.dst conf$$src
--echo "$as_me:3582: result: $cf_prog_ln_sf" >&5
-+echo "$as_me:3584: result: $cf_prog_ln_sf" >&5
- echo "${ECHO_T}$cf_prog_ln_sf" >&6
- 
- test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
- 
--echo "$as_me:3587: checking for long file names" >&5
-+echo "$as_me:3589: 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
-@@ -3623,7 +3625,7 @@
-   rm -rf $ac_xdir 2>/dev/null
- done
- fi
--echo "$as_me:3626: result: $ac_cv_sys_long_file_names" >&5
-+echo "$as_me:3628: 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
- 
-@@ -3642,7 +3644,7 @@
-   withval="$with_config_suffix"
-   case "x$withval" in
- 	(xyes|xno)
--		{ echo "$as_me:3645: WARNING: expected a value for config-suffix option" >&5
-+		{ echo "$as_me:3647: WARNING: expected a value for config-suffix option" >&5
- echo "$as_me: WARNING: expected a value for config-suffix option" >&2;}
- 		;;
- 	(*)	cf_config_suffix="$withval"
-@@ -3652,7 +3654,7 @@
- 
- # If we find pkg-config, check if we should install the ".pc" files.
- 
--echo "$as_me:3655: checking if you want to use pkg-config" >&5
-+echo "$as_me:3657: 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.
-@@ -3662,7 +3664,7 @@
- else
-   cf_pkg_config=yes
- fi;
--echo "$as_me:3665: result: $cf_pkg_config" >&5
-+echo "$as_me:3667: result: $cf_pkg_config" >&5
- echo "${ECHO_T}$cf_pkg_config" >&6
- 
- case $cf_pkg_config in
-@@ -3674,7 +3676,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--echo "$as_me:3677: checking for $ac_word" >&5
-+echo "$as_me:3679: 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
-@@ -3691,7 +3693,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:3694: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3696: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -3702,10 +3704,10 @@
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- 
- if test -n "$PKG_CONFIG"; then
--  echo "$as_me:3705: result: $PKG_CONFIG" >&5
-+  echo "$as_me:3707: result: $PKG_CONFIG" >&5
- echo "${ECHO_T}$PKG_CONFIG" >&6
- else
--  echo "$as_me:3708: result: no" >&5
-+  echo "$as_me:3710: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3714,7 +3716,7 @@
-   ac_pt_PKG_CONFIG=$PKG_CONFIG
-   # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo "$as_me:3717: checking for $ac_word" >&5
-+echo "$as_me:3719: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3731,7 +3733,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:3734: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3736: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -3743,10 +3745,10 @@
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- 
- if test -n "$ac_pt_PKG_CONFIG"; then
--  echo "$as_me:3746: result: $ac_pt_PKG_CONFIG" >&5
-+  echo "$as_me:3748: result: $ac_pt_PKG_CONFIG" >&5
- echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
- else
--  echo "$as_me:3749: result: no" >&5
-+  echo "$as_me:3751: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3789,24 +3791,24 @@
- 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:3792: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+	{ { echo "$as_me:3794: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
- echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
- esac
- 
- elif test "x$cf_pkg_config" != xno ; then
--	{ echo "$as_me:3799: WARNING: pkg-config is not installed" >&5
-+	{ echo "$as_me:3801: WARNING: pkg-config is not installed" >&5
- echo "$as_me: WARNING: pkg-config is not installed" >&2;}
- fi
- 
- case $PKG_CONFIG in
- (no|none|yes)
--	echo "$as_me:3805: checking for pkg-config library directory" >&5
-+	echo "$as_me:3807: checking for pkg-config library directory" >&5
- echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
- 	;;
- (*)
--	echo "$as_me:3809: checking for $PKG_CONFIG library directory" >&5
-+	echo "$as_me:3811: checking for $PKG_CONFIG library directory" >&5
- echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
- 	;;
- esac
-@@ -3861,18 +3863,18 @@
- 
- 	test -n "$verbose" && echo "	list..." 1>&6
- 
--echo "${as_me:-configure}:3864: testing list... ..." 1>&5
-+echo "${as_me:-configure}:3866: testing list... ..." 1>&5
- 
- 	for cf_config in $cf_search_path
- 	do
- 		test -n "$verbose" && echo "	checking $cf_config/pkgconfig" 1>&6
- 
--echo "${as_me:-configure}:3870: testing checking $cf_config/pkgconfig ..." 1>&5
-+echo "${as_me:-configure}:3872: testing checking $cf_config/pkgconfig ..." 1>&5
- 
- 		if test -d $cf_config/pkgconfig
- 		then
- 			PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
--			echo "$as_me:3875: checking done" >&5
-+			echo "$as_me:3877: checking done" >&5
- echo $ECHO_N "checking done... $ECHO_C" >&6
- 			break
- 		fi
-@@ -3883,16 +3885,16 @@
- esac
- 
- if test "x$PKG_CONFIG_LIBDIR" != xno ; then
--	echo "$as_me:3886: result: $PKG_CONFIG_LIBDIR" >&5
-+	echo "$as_me:3888: result: $PKG_CONFIG_LIBDIR" >&5
- echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
- fi
- 
- if test "x$PKG_CONFIG" != xnone
- then
--	echo "$as_me:3892: checking if we should install .pc files for $PKG_CONFIG" >&5
-+	echo "$as_me:3894: checking if we should install .pc files for $PKG_CONFIG" >&5
- echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
- else
--	echo "$as_me:3895: checking if we should install .pc files" >&5
-+	echo "$as_me:3897: checking if we should install .pc files" >&5
- echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
- fi
- 
-@@ -3903,7 +3905,7 @@
- else
-   enable_pc_files=no
- fi;
--echo "$as_me:3906: result: $enable_pc_files" >&5
-+echo "$as_me:3908: result: $enable_pc_files" >&5
- echo "${ECHO_T}$enable_pc_files" >&6
- 
- if test "x$enable_pc_files" != xno
-@@ -3911,7 +3913,7 @@
- 	MAKE_PC_FILES=
- 	case "x$PKG_CONFIG_LIBDIR" in
- 	(xno|xyes)
--		{ echo "$as_me:3914: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
-+		{ echo "$as_me:3916: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
- echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
- 		;;
- 	(*)
-@@ -3941,7 +3943,7 @@
- 	PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:3944: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
-+	{ { echo "$as_me:3946: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
- echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -3955,7 +3957,7 @@
- 
- if test -z "$MAKE_PC_FILES"
- then
--	echo "$as_me:3958: checking for suffix to add to pc-files" >&5
-+	echo "$as_me:3960: checking for suffix to add to pc-files" >&5
- echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
- 
- # Check whether --with-pc-suffix or --without-pc-suffix was given.
-@@ -3970,13 +3972,13 @@
- 	esac
- fi;
- 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
--	echo "$as_me:3973: result: $PC_MODULE_SUFFIX" >&5
-+	echo "$as_me:3975: result: $PC_MODULE_SUFFIX" >&5
- echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
- 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
- 
- fi
- 
--echo "$as_me:3979: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:3981: 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.
-@@ -3986,11 +3988,11 @@
- else
-   enable_mixedcase=auto
- fi;
--echo "$as_me:3989: result: $enable_mixedcase" >&5
-+echo "$as_me:3991: result: $enable_mixedcase" >&5
- echo "${ECHO_T}$enable_mixedcase" >&6
- if test "$enable_mixedcase" = "auto" ; then
- 
--echo "$as_me:3993: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:3995: 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
-@@ -4017,7 +4019,7 @@
- fi
- 
- fi
--echo "$as_me:4020: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:4022: result: $cf_cv_mixedcase" >&5
- echo "${ECHO_T}$cf_cv_mixedcase" >&6
- test "$cf_cv_mixedcase" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -4036,7 +4038,7 @@
- fi
- 
- # do this after mixed-case option (tags/TAGS is not as important as tic).
--echo "$as_me:4039: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:4041: 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
-@@ -4056,11 +4058,11 @@
- rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:4059: result: yes" >&5
-+  echo "$as_me:4061: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:4063: result: no" >&5
-+  echo "$as_me:4065: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -4069,7 +4071,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:4072: checking for $ac_word" >&5
-+echo "$as_me:4074: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CTAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4084,7 +4086,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CTAGS="$ac_prog"
--echo "$as_me:4087: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4089: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4092,10 +4094,10 @@
- fi
- CTAGS=$ac_cv_prog_CTAGS
- if test -n "$CTAGS"; then
--  echo "$as_me:4095: result: $CTAGS" >&5
-+  echo "$as_me:4097: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
--  echo "$as_me:4098: result: no" >&5
-+  echo "$as_me:4100: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4106,7 +4108,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:4109: checking for $ac_word" >&5
-+echo "$as_me:4111: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ETAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4121,7 +4123,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ETAGS="$ac_prog"
--echo "$as_me:4124: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4126: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4129,10 +4131,10 @@
- fi
- ETAGS=$ac_cv_prog_ETAGS
- if test -n "$ETAGS"; then
--  echo "$as_me:4132: result: $ETAGS" >&5
-+  echo "$as_me:4134: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
--  echo "$as_me:4135: result: no" >&5
-+  echo "$as_me:4137: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4141,7 +4143,7 @@
- 
- # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
- set dummy ${CTAGS:-ctags}; ac_word=$2
--echo "$as_me:4144: checking for $ac_word" >&5
-+echo "$as_me:4146: 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
-@@ -4156,7 +4158,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:4159: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4161: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4165,17 +4167,17 @@
- fi
- MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
- if test -n "$MAKE_LOWER_TAGS"; then
--  echo "$as_me:4168: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:4170: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:4171: result: no" >&5
-+  echo "$as_me:4173: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$cf_cv_mixedcase" = yes ; then
- 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
- set dummy ${ETAGS:-etags}; ac_word=$2
--echo "$as_me:4178: checking for $ac_word" >&5
-+echo "$as_me:4180: 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
-@@ -4190,7 +4192,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:4193: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4195: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4199,10 +4201,10 @@
- fi
- MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
- if test -n "$MAKE_UPPER_TAGS"; then
--  echo "$as_me:4202: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:4204: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:4205: result: no" >&5
-+  echo "$as_me:4207: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4222,7 +4224,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:4225: checking for makeflags variable" >&5
-+echo "$as_me:4227: 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
-@@ -4252,7 +4254,7 @@
- 			;;
- 		(*)
- 
--echo "${as_me:-configure}:4255: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
-+echo "${as_me:-configure}:4257: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
- 
- 			;;
- 		esac
-@@ -4260,13 +4262,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:4263: result: $cf_cv_makeflags" >&5
-+echo "$as_me:4265: 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:4269: checking for $ac_word" >&5
-+echo "$as_me:4271: 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
-@@ -4281,7 +4283,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:4284: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4286: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4289,10 +4291,10 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:4292: result: $RANLIB" >&5
-+  echo "$as_me:4294: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:4295: result: no" >&5
-+  echo "$as_me:4297: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4301,7 +4303,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:4304: checking for $ac_word" >&5
-+echo "$as_me:4306: 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
-@@ -4316,7 +4318,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:4319: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4321: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4325,10 +4327,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:4328: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:4330: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:4331: result: no" >&5
-+  echo "$as_me:4333: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4340,7 +4342,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:4343: checking for $ac_word" >&5
-+echo "$as_me:4345: 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
-@@ -4355,7 +4357,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:4358: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4360: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4363,10 +4365,10 @@
- fi
- LD=$ac_cv_prog_LD
- if test -n "$LD"; then
--  echo "$as_me:4366: result: $LD" >&5
-+  echo "$as_me:4368: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:4369: result: no" >&5
-+  echo "$as_me:4371: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4375,7 +4377,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:4378: checking for $ac_word" >&5
-+echo "$as_me:4380: 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
-@@ -4390,7 +4392,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:4393: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4395: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4399,10 +4401,10 @@
- fi
- ac_ct_LD=$ac_cv_prog_ac_ct_LD
- if test -n "$ac_ct_LD"; then
--  echo "$as_me:4402: result: $ac_ct_LD" >&5
-+  echo "$as_me:4404: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:4405: result: no" >&5
-+  echo "$as_me:4407: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4414,7 +4416,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:4417: checking for $ac_word" >&5
-+echo "$as_me:4419: 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
-@@ -4429,7 +4431,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:4432: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4434: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4437,10 +4439,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:4440: result: $AR" >&5
-+  echo "$as_me:4442: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4443: result: no" >&5
-+  echo "$as_me:4445: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4449,7 +4451,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:4452: checking for $ac_word" >&5
-+echo "$as_me:4454: 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
-@@ -4464,7 +4466,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:4467: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4469: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4473,10 +4475,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:4476: result: $ac_ct_AR" >&5
-+  echo "$as_me:4478: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4479: result: no" >&5
-+  echo "$as_me:4481: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4488,7 +4490,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
- set dummy ${ac_tool_prefix}nm; ac_word=$2
--echo "$as_me:4491: checking for $ac_word" >&5
-+echo "$as_me:4493: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4503,7 +4505,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NM="${ac_tool_prefix}nm"
--echo "$as_me:4506: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4508: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4511,10 +4513,10 @@
- fi
- NM=$ac_cv_prog_NM
- if test -n "$NM"; then
--  echo "$as_me:4514: result: $NM" >&5
-+  echo "$as_me:4516: result: $NM" >&5
- echo "${ECHO_T}$NM" >&6
- else
--  echo "$as_me:4517: result: no" >&5
-+  echo "$as_me:4519: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4523,7 +4525,7 @@
-   ac_ct_NM=$NM
-   # Extract the first word of "nm", so it can be a program name with args.
- set dummy nm; ac_word=$2
--echo "$as_me:4526: checking for $ac_word" >&5
-+echo "$as_me:4528: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4538,7 +4540,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NM="nm"
--echo "$as_me:4541: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4543: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4547,10 +4549,10 @@
- fi
- ac_ct_NM=$ac_cv_prog_ac_ct_NM
- if test -n "$ac_ct_NM"; then
--  echo "$as_me:4550: result: $ac_ct_NM" >&5
-+  echo "$as_me:4552: result: $ac_ct_NM" >&5
- echo "${ECHO_T}$ac_ct_NM" >&6
- else
--  echo "$as_me:4553: result: no" >&5
-+  echo "$as_me:4555: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4562,7 +4564,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:4565: checking for $ac_word" >&5
-+echo "$as_me:4567: 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
-@@ -4577,7 +4579,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:4580: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4582: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4585,10 +4587,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:4588: result: $AR" >&5
-+  echo "$as_me:4590: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4591: result: no" >&5
-+  echo "$as_me:4593: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4597,7 +4599,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:4600: checking for $ac_word" >&5
-+echo "$as_me:4602: 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
-@@ -4612,7 +4614,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:4615: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4617: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4621,10 +4623,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:4624: result: $ac_ct_AR" >&5
-+  echo "$as_me:4626: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4627: result: no" >&5
-+  echo "$as_me:4629: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4633,7 +4635,7 @@
-   AR="$ac_cv_prog_AR"
- fi
- 
--echo "$as_me:4636: checking for options to update archives" >&5
-+echo "$as_me:4638: 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
-@@ -4656,13 +4658,13 @@
- 		rm -f conftest.a
- 
- 		cat >conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:4664: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4665: \$? = $ac_status" >&5
-+  echo "$as_me:4667: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
- 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
-@@ -4673,7 +4675,7 @@
- 		else
- 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
- 
--echo "${as_me:-configure}:4676: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:4678: testing cannot compile test-program ..." 1>&5
- 
- 			break
- 		fi
-@@ -4681,7 +4683,7 @@
- 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
- 
- fi
--echo "$as_me:4684: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:4686: result: $cf_cv_ar_flags" >&5
- echo "${ECHO_T}$cf_cv_ar_flags" >&6
- 
- if test -n "$ARFLAGS" ; then
-@@ -4692,7 +4694,7 @@
- 	ARFLAGS=$cf_cv_ar_flags
- fi
- 
--echo "$as_me:4695: checking if you have specified an install-prefix" >&5
-+echo "$as_me:4697: 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.
-@@ -4705,7 +4707,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:4708: result: $DESTDIR" >&5
-+echo "$as_me:4710: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -4733,7 +4735,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:4736: checking for $ac_word" >&5
-+echo "$as_me:4738: 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
-@@ -4748,7 +4750,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:4751: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4753: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4756,10 +4758,10 @@
- fi
- BUILD_CC=$ac_cv_prog_BUILD_CC
- if test -n "$BUILD_CC"; then
--  echo "$as_me:4759: result: $BUILD_CC" >&5
-+  echo "$as_me:4761: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:4762: result: no" >&5
-+  echo "$as_me:4764: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4768,12 +4770,12 @@
- test -n "$BUILD_CC" || BUILD_CC="none"
- 
- fi;
--	echo "$as_me:4771: checking for native build C compiler" >&5
-+	echo "$as_me:4773: checking for native build C compiler" >&5
- echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
--	echo "$as_me:4773: result: $BUILD_CC" >&5
-+	echo "$as_me:4775: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- 
--	echo "$as_me:4776: checking for native build C preprocessor" >&5
-+	echo "$as_me:4778: 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.
-@@ -4783,10 +4785,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:4786: result: $BUILD_CPP" >&5
-+	echo "$as_me:4788: result: $BUILD_CPP" >&5
- echo "${ECHO_T}$BUILD_CPP" >&6
- 
--	echo "$as_me:4789: checking for native build C flags" >&5
-+	echo "$as_me:4791: 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.
-@@ -4794,10 +4796,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:4797: result: $BUILD_CFLAGS" >&5
-+	echo "$as_me:4799: result: $BUILD_CFLAGS" >&5
- echo "${ECHO_T}$BUILD_CFLAGS" >&6
- 
--	echo "$as_me:4800: checking for native build C preprocessor-flags" >&5
-+	echo "$as_me:4802: 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.
-@@ -4805,10 +4807,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:4808: result: $BUILD_CPPFLAGS" >&5
-+	echo "$as_me:4810: result: $BUILD_CPPFLAGS" >&5
- echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- 
--	echo "$as_me:4811: checking for native build linker-flags" >&5
-+	echo "$as_me:4813: 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.
-@@ -4816,10 +4818,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:4819: result: $BUILD_LDFLAGS" >&5
-+	echo "$as_me:4821: result: $BUILD_LDFLAGS" >&5
- echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- 
--	echo "$as_me:4822: checking for native build linker-libraries" >&5
-+	echo "$as_me:4824: 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.
-@@ -4827,7 +4829,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:4830: result: $BUILD_LIBS" >&5
-+	echo "$as_me:4832: result: $BUILD_LIBS" >&5
- echo "${ECHO_T}$BUILD_LIBS" >&6
- 
- 	# this assumes we're on Unix.
-@@ -4837,7 +4839,7 @@
- 	: ${BUILD_CC:='${CC}'}
- 
- 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
--		{ { echo "$as_me:4840: error: Cross-build requires two compilers.
-+		{ { echo "$as_me:4842: 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;}
-@@ -4862,7 +4864,7 @@
- ### shared, for example.
- cf_list_models=""
- 
--echo "$as_me:4865: checking if libtool -version-number should be used" >&5
-+echo "$as_me:4867: checking if libtool -version-number should be used" >&5
- echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
- 
- # Check whether --enable-libtool-version or --disable-libtool-version was given.
-@@ -4879,7 +4881,7 @@
- 	cf_libtool_version=yes
- 
- fi;
--echo "$as_me:4882: result: $cf_libtool_version" >&5
-+echo "$as_me:4884: result: $cf_libtool_version" >&5
- echo "${ECHO_T}$cf_libtool_version" >&6
- 
- if test "$cf_libtool_version" = yes ; then
-@@ -4888,25 +4890,25 @@
- 	LIBTOOL_VERSION="-version-info"
- 	case "x$VERSION" in
- 	(x)
--		{ echo "$as_me:4891: WARNING: VERSION was not set" >&5
-+		{ echo "$as_me:4893: WARNING: VERSION was not set" >&5
- echo "$as_me: WARNING: VERSION was not set" >&2;}
- 		;;
- 	(x*.*.*)
- 		ABI_VERSION="$VERSION"
- 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
- 
--echo "${as_me:-configure}:4898: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
-+echo "${as_me:-configure}:4900: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
- 
- 		;;
- 	(x*:*:*)
- 		ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
- 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
- 
--echo "${as_me:-configure}:4905: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
-+echo "${as_me:-configure}:4907: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:4909: WARNING: unexpected VERSION value: $VERSION" >&5
-+		{ echo "$as_me:4911: WARNING: unexpected VERSION value: $VERSION" >&5
- echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
- 		;;
- 	esac
-@@ -4928,7 +4930,7 @@
- LIB_INSTALL=
- LIB_UNINSTALL=
- 
--echo "$as_me:4931: checking if you want to build libraries with libtool" >&5
-+echo "$as_me:4933: 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.
-@@ -4938,7 +4940,7 @@
- else
-   with_libtool=no
- fi;
--echo "$as_me:4941: result: $with_libtool" >&5
-+echo "$as_me:4943: result: $with_libtool" >&5
- echo "${ECHO_T}$with_libtool" >&6
- if test "$with_libtool" != "no"; then
- 
-@@ -4969,7 +4971,7 @@
- 	with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:4972: error: expected a pathname, not \"$with_libtool\"" >&5
-+	{ { echo "$as_me:4974: error: expected a pathname, not \"$with_libtool\"" >&5
- echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -4982,7 +4984,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:4985: checking for $ac_word" >&5
-+echo "$as_me:4987: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4997,7 +4999,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
--echo "$as_me:5000: found $ac_dir/$ac_word" >&5
-+echo "$as_me:5002: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -5005,10 +5007,10 @@
- fi
- LIBTOOL=$ac_cv_prog_LIBTOOL
- if test -n "$LIBTOOL"; then
--  echo "$as_me:5008: result: $LIBTOOL" >&5
-+  echo "$as_me:5010: result: $LIBTOOL" >&5
- echo "${ECHO_T}$LIBTOOL" >&6
- else
--  echo "$as_me:5011: result: no" >&5
-+  echo "$as_me:5013: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5021,7 +5023,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:5024: checking for $ac_word" >&5
-+echo "$as_me:5026: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5036,7 +5038,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
--echo "$as_me:5039: found $ac_dir/$ac_word" >&5
-+echo "$as_me:5041: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -5044,10 +5046,10 @@
- fi
- ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
- if test -n "$ac_ct_LIBTOOL"; then
--  echo "$as_me:5047: result: $ac_ct_LIBTOOL" >&5
-+  echo "$as_me:5049: result: $ac_ct_LIBTOOL" >&5
- echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
- else
--  echo "$as_me:5050: result: no" >&5
-+  echo "$as_me:5052: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5078,7 +5080,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:5081: checking for $ac_word" >&5
-+echo "$as_me:5083: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5093,7 +5095,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
--echo "$as_me:5096: found $ac_dir/$ac_word" >&5
-+echo "$as_me:5098: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -5101,10 +5103,10 @@
- fi
- LIBTOOL=$ac_cv_prog_LIBTOOL
- if test -n "$LIBTOOL"; then
--  echo "$as_me:5104: result: $LIBTOOL" >&5
-+  echo "$as_me:5106: result: $LIBTOOL" >&5
- echo "${ECHO_T}$LIBTOOL" >&6
- else
--  echo "$as_me:5107: result: no" >&5
-+  echo "$as_me:5109: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5117,7 +5119,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:5120: checking for $ac_word" >&5
-+echo "$as_me:5122: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5132,7 +5134,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
--echo "$as_me:5135: found $ac_dir/$ac_word" >&5
-+echo "$as_me:5137: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -5140,10 +5142,10 @@
- fi
- ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
- if test -n "$ac_ct_LIBTOOL"; then
--  echo "$as_me:5143: result: $ac_ct_LIBTOOL" >&5
-+  echo "$as_me:5145: result: $ac_ct_LIBTOOL" >&5
- echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
- else
--  echo "$as_me:5146: result: no" >&5
-+  echo "$as_me:5148: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5165,7 +5167,7 @@
- 		fi
- 	fi
- 	if test -z "$LIBTOOL" ; then
--		{ { echo "$as_me:5168: error: Cannot find libtool" >&5
-+		{ { echo "$as_me:5170: error: Cannot find libtool" >&5
- echo "$as_me: error: Cannot find libtool" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -5181,7 +5183,7 @@
- 
- if test -n "$LIBTOOL" && test "$LIBTOOL" != none
- then
--	echo "$as_me:5184: checking version of $LIBTOOL" >&5
-+	echo "$as_me:5186: checking version of $LIBTOOL" >&5
- echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
- 
- if test -n "$LIBTOOL" && test "$LIBTOOL" != none
-@@ -5192,15 +5194,15 @@
- fi
- test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
- 
--	echo "$as_me:5195: result: $cf_cv_libtool_version" >&5
-+	echo "$as_me:5197: 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:5198: error: This is not GNU libtool" >&5
-+		{ { echo "$as_me:5200: error: This is not GNU libtool" >&5
- echo "$as_me: error: This is not GNU libtool" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- else
--	{ { echo "$as_me:5203: error: GNU libtool has not been found" >&5
-+	{ { echo "$as_me:5205: error: GNU libtool has not been found" >&5
- echo "$as_me: error: GNU libtool has not been found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5236,7 +5238,7 @@
- 
- else
- 
--echo "$as_me:5239: checking if you want to build shared libraries" >&5
-+echo "$as_me:5241: 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.
-@@ -5246,11 +5248,11 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:5249: result: $with_shared" >&5
-+echo "$as_me:5251: result: $with_shared" >&5
- echo "${ECHO_T}$with_shared" >&6
- test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
- 
--echo "$as_me:5253: checking if you want to build static libraries" >&5
-+echo "$as_me:5255: 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.
-@@ -5260,11 +5262,11 @@
- else
-   with_normal=yes
- fi;
--echo "$as_me:5263: result: $with_normal" >&5
-+echo "$as_me:5265: result: $with_normal" >&5
- echo "${ECHO_T}$with_normal" >&6
- test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
- 
--echo "$as_me:5267: checking if you want to build debug libraries" >&5
-+echo "$as_me:5269: 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.
-@@ -5274,11 +5276,11 @@
- else
-   with_debug=yes
- fi;
--echo "$as_me:5277: result: $with_debug" >&5
-+echo "$as_me:5279: result: $with_debug" >&5
- echo "${ECHO_T}$with_debug" >&6
- test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
- 
--echo "$as_me:5281: checking if you want to build profiling libraries" >&5
-+echo "$as_me:5283: 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.
-@@ -5288,7 +5290,7 @@
- else
-   with_profile=no
- fi;
--echo "$as_me:5291: result: $with_profile" >&5
-+echo "$as_me:5293: result: $with_profile" >&5
- echo "${ECHO_T}$with_profile" >&6
- test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
- 
-@@ -5296,7 +5298,7 @@
- 
- if test "X$cf_with_cxx_binding" != Xno; then
- if test "x$with_shared" = "xyes"; then
--echo "$as_me:5299: checking if you want to build C++ shared libraries" >&5
-+echo "$as_me:5301: checking if you want to build C++ shared libraries" >&5
- echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
- 
- # Check whether --with-cxx-shared or --without-cxx-shared was given.
-@@ -5306,26 +5308,26 @@
- else
-   with_shared_cxx=no
- fi;
--echo "$as_me:5309: result: $with_shared_cxx" >&5
-+echo "$as_me:5311: result: $with_shared_cxx" >&5
- echo "${ECHO_T}$with_shared_cxx" >&6
- fi
- fi
- 
- ###############################################################################
- 
--echo "$as_me:5316: checking for specified models" >&5
-+echo "$as_me:5318: 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:5320: result: $cf_list_models" >&5
-+echo "$as_me:5322: 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:5325: checking for default model" >&5
-+echo "$as_me:5327: 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:5328: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:5330: result: $DFT_LWR_MODEL" >&5
- echo "${ECHO_T}$DFT_LWR_MODEL" >&6
- 
- DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-@@ -5339,7 +5341,7 @@
- LIB_DIR=../lib
- LIB_2ND=../../lib
- 
--echo "$as_me:5342: checking if you want to have a library-prefix" >&5
-+echo "$as_me:5344: checking if you want to have a library-prefix" >&5
- echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
- 
- # Check whether --with-lib-prefix or --without-lib-prefix was given.
-@@ -5349,7 +5351,7 @@
- else
-   with_lib_prefix=auto
- fi;
--echo "$as_me:5352: result: $with_lib_prefix" >&5
-+echo "$as_me:5354: result: $with_lib_prefix" >&5
- echo "${ECHO_T}$with_lib_prefix" >&6
- 
- if test $with_lib_prefix = auto
-@@ -5377,19 +5379,19 @@
- 
- LIB_SUFFIX=
- 
--	echo "$as_me:5380: checking for PATH separator" >&5
-+	echo "$as_me:5382: checking for PATH separator" >&5
- echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
- 	case $cf_cv_system_name in
- 	(os2*)	PATH_SEPARATOR=';'  ;;
- 	(*)	${PATH_SEPARATOR:=':'}  ;;
- 	esac
- 
--	echo "$as_me:5387: result: $PATH_SEPARATOR" >&5
-+	echo "$as_me:5389: result: $PATH_SEPARATOR" >&5
- echo "${ECHO_T}$PATH_SEPARATOR" >&6
- 
- ###############################################################################
- 
--echo "$as_me:5392: checking if you want to build a separate terminfo library" >&5
-+echo "$as_me:5394: 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.
-@@ -5399,10 +5401,10 @@
- else
-   with_termlib=no
- fi;
--echo "$as_me:5402: result: $with_termlib" >&5
-+echo "$as_me:5404: result: $with_termlib" >&5
- echo "${ECHO_T}$with_termlib" >&6
- 
--echo "$as_me:5405: checking if you want to build a separate tic library" >&5
-+echo "$as_me:5407: 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.
-@@ -5412,7 +5414,7 @@
- else
-   with_ticlib=no
- fi;
--echo "$as_me:5415: result: $with_ticlib" >&5
-+echo "$as_me:5417: result: $with_ticlib" >&5
- echo "${ECHO_T}$with_ticlib" >&6
- 
- if test X"$CC_G_OPT" = X"" ; then
-@@ -5425,7 +5427,7 @@
- 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
- fi
- 
--echo "$as_me:5428: checking for default loader flags" >&5
-+echo "$as_me:5430: 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=''   ;;
-@@ -5434,13 +5436,13 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:5437: result: $LD_MODEL" >&5
-+echo "$as_me:5439: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- case $DFT_LWR_MODEL in
- (shared)
- 
--echo "$as_me:5443: checking if rpath option should be used" >&5
-+echo "$as_me:5445: 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.
-@@ -5450,10 +5452,10 @@
- else
-   cf_cv_enable_rpath=no
- fi;
--echo "$as_me:5453: result: $cf_cv_enable_rpath" >&5
-+echo "$as_me:5455: result: $cf_cv_enable_rpath" >&5
- echo "${ECHO_T}$cf_cv_enable_rpath" >&6
- 
--echo "$as_me:5456: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5458: 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.
-@@ -5463,7 +5465,7 @@
- else
-   cf_cv_do_relink=yes
- fi;
--echo "$as_me:5466: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5468: result: $cf_cv_do_relink" >&5
- echo "${ECHO_T}$cf_cv_do_relink" >&6
- 	;;
- esac
-@@ -5474,7 +5476,7 @@
- LD_RPATH_OPT=
- if test "x$cf_cv_enable_rpath" != xno
- then
--	echo "$as_me:5477: checking for an rpath option" >&5
-+	echo "$as_me:5479: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- 	case $cf_cv_system_name in
- 	(irix*)
-@@ -5505,12 +5507,12 @@
- 	(*)
- 		;;
- 	esac
--	echo "$as_me:5508: result: $LD_RPATH_OPT" >&5
-+	echo "$as_me:5510: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- 	case "x$LD_RPATH_OPT" in
- 	(x-R*)
--		echo "$as_me:5513: checking if we need a space after rpath option" >&5
-+		echo "$as_me:5515: 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"
- 
-@@ -5531,7 +5533,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 5534 "configure"
-+#line 5536 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5543,16 +5545,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5546: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5548: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5549: \$? = $ac_status" >&5
-+  echo "$as_me:5551: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5552: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5554: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5555: \$? = $ac_status" >&5
-+  echo "$as_me:5557: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -5562,7 +5564,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		LIBS="$cf_save_LIBS"
--		echo "$as_me:5565: result: $cf_rpath_space" >&5
-+		echo "$as_me:5567: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 		;;
-@@ -5584,7 +5586,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:5587: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:5589: 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.
-@@ -5599,9 +5601,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:5602: result: $withval" >&5
-+		echo "$as_me:5604: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:5604: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:5606: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -5610,7 +5612,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:5613: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:5615: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -5633,14 +5635,14 @@
- 
- 	if test "$cf_try_fPIC" = yes
- 	then
--		echo "$as_me:5636: checking which $CC option to use" >&5
-+		echo "$as_me:5638: 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 5643 "configure"
-+#line 5645 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -5652,16 +5654,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5655: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5657: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5658: \$? = $ac_status" >&5
-+  echo "$as_me:5660: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5661: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5663: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5664: \$? = $ac_status" >&5
-+  echo "$as_me:5666: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -5670,7 +5672,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:5673: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:5675: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -5741,7 +5743,7 @@
- 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:5744: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:5746: 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
-@@ -5750,7 +5752,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 5753 "configure"
-+#line 5755 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5762,16 +5764,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5765: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5767: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5768: \$? = $ac_status" >&5
-+  echo "$as_me:5770: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5771: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5773: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5774: \$? = $ac_status" >&5
-+  echo "$as_me:5776: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -5782,7 +5784,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:5785: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:5787: 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"
-@@ -6007,7 +6009,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 6010 "configure"
-+#line 6012 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6019,16 +6021,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6022: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6025: \$? = $ac_status" >&5
-+  echo "$as_me:6027: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6028: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6030: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6031: \$? = $ac_status" >&5
-+  echo "$as_me:6033: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6065,7 +6067,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:6068: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:6070: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -6075,7 +6077,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <
- int main(int argc, char *argv[])
- {
-@@ -6087,18 +6089,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:6090: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:6092: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:6092: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:6094: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6095: \$? = $ac_status" >&5
-+  echo "$as_me:6097: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:6097: result: yes" >&5
-+				echo "$as_me:6099: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:6101: result: no" >&5
-+				echo "$as_me:6103: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -6113,17 +6115,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:6116: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:6118: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6120: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6122: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- for model in $cf_list_models; do
- 	case $model in
- 	(libtool)
- 
--echo "$as_me:6126: checking for additional libtool options" >&5
-+echo "$as_me:6128: checking for additional libtool options" >&5
- echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
- 
- # Check whether --with-libtool-opts or --without-libtool-opts was given.
-@@ -6133,7 +6135,7 @@
- else
-   with_libtool_opts=no
- fi;
--echo "$as_me:6136: result: $with_libtool_opts" >&5
-+echo "$as_me:6138: result: $with_libtool_opts" >&5
- echo "${ECHO_T}$with_libtool_opts" >&6
- 
- case .$with_libtool_opts in
-@@ -6144,7 +6146,7 @@
- 	;;
- esac
- 
--echo "$as_me:6147: checking if exported-symbols file should be used" >&5
-+echo "$as_me:6149: checking if exported-symbols file should be used" >&5
- echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-export-syms or --without-export-syms was given.
-@@ -6159,7 +6161,7 @@
- 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
- 
- fi
--echo "$as_me:6162: result: $with_export_syms" >&5
-+echo "$as_me:6164: result: $with_export_syms" >&5
- echo "${ECHO_T}$with_export_syms" >&6
- if test "x$with_export_syms" != xno
- then
-@@ -6170,15 +6172,15 @@
- 		;;
- 	(shared)
- 		if test "$CC_SHARED_OPTS" = "unknown"; then
--			{ { echo "$as_me:6173: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:6175: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
- 		# workaround for inept transition to PIE vs PIC...
--		echo "$as_me:6178: checking if current CFLAGS link properly" >&5
-+		echo "$as_me:6180: checking if current CFLAGS link properly" >&5
- echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 6181 "configure"
-+#line 6183 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6190,16 +6192,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6193: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6195: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6196: \$? = $ac_status" >&5
-+  echo "$as_me:6198: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6199: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6201: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6202: \$? = $ac_status" >&5
-+  echo "$as_me:6204: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cflags_work=yes
- else
-@@ -6208,18 +6210,18 @@
- cf_cflags_work=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:6211: result: $cf_cflags_work" >&5
-+		echo "$as_me:6213: result: $cf_cflags_work" >&5
- echo "${ECHO_T}$cf_cflags_work" >&6
- 		if test "$cf_cflags_work" = no
- 		then
- 			test -n "$verbose" && echo "	try to work around by appending shared-options" 1>&6
- 
--echo "${as_me:-configure}:6217: testing try to work around by appending shared-options ..." 1>&5
-+echo "${as_me:-configure}:6219: testing try to work around by appending shared-options ..." 1>&5
- 
- 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
- 		fi
- 
--echo "$as_me:6222: checking if versioned-symbols file should be used" >&5
-+echo "$as_me:6224: checking if versioned-symbols file should be used" >&5
- echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-versioned-syms or --without-versioned-syms was given.
-@@ -6237,18 +6239,18 @@
- (xno)
- 	;;
- (x/*)
--	test -f "$with_versioned_syms" || { { echo "$as_me:6240: error: expected a filename: $with_versioned_syms" >&5
-+	test -f "$with_versioned_syms" || { { echo "$as_me:6242: error: expected a filename: $with_versioned_syms" >&5
- echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
- (*)
--	test -f "$with_versioned_syms" || { { echo "$as_me:6245: error: expected a filename: $with_versioned_syms" >&5
-+	test -f "$with_versioned_syms" || { { echo "$as_me:6247: error: expected a filename: $with_versioned_syms" >&5
- echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
-    { (exit 1); exit 1; }; }
- 	with_versioned_syms=`pwd`/"$with_versioned_syms"
- 	;;
- esac
--echo "$as_me:6251: result: $with_versioned_syms" >&5
-+echo "$as_me:6253: result: $with_versioned_syms" >&5
- echo "${ECHO_T}$with_versioned_syms" >&6
- 
- RESULTING_SYMS=
-@@ -6264,7 +6266,7 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6267: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6269: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*-dy\ *)
-@@ -6272,11 +6274,11 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6275: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6277: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:6279: WARNING: this system does not support versioned-symbols" >&5
-+		{ echo "$as_me:6281: WARNING: this system does not support versioned-symbols" >&5
- echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
- 		;;
- 	esac
-@@ -6288,7 +6290,7 @@
- 	# symbols.
- 	if test "x$VERSIONED_SYMS" != "x"
- 	then
--		echo "$as_me:6291: checking if wildcards can be used to selectively omit symbols" >&5
-+		echo "$as_me:6293: checking if wildcards can be used to selectively omit symbols" >&5
- echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
- 		WILDCARD_SYMS=no
- 
-@@ -6325,7 +6327,7 @@
- } submodule_1.0;
- EOF
- 		cat >conftest.$ac_ext <&5 |fgrep _ismissing | egrep '[ 	][DT][ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
--		echo "$as_me:6359: result: $WILDCARD_SYMS" >&5
-+		echo "$as_me:6361: result: $WILDCARD_SYMS" >&5
- echo "${ECHO_T}$WILDCARD_SYMS" >&6
- 		rm -f conftest.*
- 	fi
-@@ -6369,7 +6371,7 @@
- ### Checks for special libraries, must be done up-front.
- SHLIB_LIST=""
- 
--echo "$as_me:6372: checking if you want to link with the GPM mouse library" >&5
-+echo "$as_me:6374: 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.
-@@ -6379,27 +6381,27 @@
- else
-   with_gpm=maybe
- fi;
--echo "$as_me:6382: result: $with_gpm" >&5
-+echo "$as_me:6384: result: $with_gpm" >&5
- echo "${ECHO_T}$with_gpm" >&6
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:6386: checking for gpm.h" >&5
-+	echo "$as_me:6388: 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 6392 "configure"
-+#line 6394 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:6396: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:6398: \"$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:6402: \$? = $ac_status" >&5
-+  echo "$as_me:6404: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -6418,7 +6420,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:6421: result: $ac_cv_header_gpm_h" >&5
-+echo "$as_me:6423: 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
- 
-@@ -6429,7 +6431,7 @@
- 		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}:6432: testing assuming we really have GPM library ..." 1>&5
-+echo "${as_me:-configure}:6434: testing assuming we really have GPM library ..." 1>&5
- 
- cat >>confdefs.h <<\EOF
- #define HAVE_LIBGPM 1
-@@ -6437,7 +6439,7 @@
- 
- 			with_gpm=yes
- 		else
--			echo "$as_me:6440: checking for Gpm_Open in -lgpm" >&5
-+			echo "$as_me:6442: 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
-@@ -6445,7 +6447,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6448 "configure"
-+#line 6450 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6464,16 +6466,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6467: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6469: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6470: \$? = $ac_status" >&5
-+  echo "$as_me:6472: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6473: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6475: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6476: \$? = $ac_status" >&5
-+  echo "$as_me:6478: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -6484,18 +6486,18 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6487: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:6489: 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
-   with_gpm=yes
- else
- 
- 				if test "$with_gpm" = maybe; then
--					{ echo "$as_me:6494: WARNING: Cannot link with GPM library" >&5
-+					{ echo "$as_me:6496: WARNING: Cannot link with GPM library" >&5
- echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
- 					with_gpm=no
- 				else
--					{ { echo "$as_me:6498: error: Cannot link with GPM library" >&5
-+					{ { echo "$as_me:6500: error: Cannot link with GPM library" >&5
- echo "$as_me: error: Cannot link with GPM library" >&2;}
-    { (exit 1); exit 1; }; }
- 				fi
-@@ -6506,7 +6508,7 @@
- 
- else
- 
--		test "$with_gpm" != maybe && { echo "$as_me:6509: WARNING: Cannot find GPM header" >&5
-+		test "$with_gpm" != maybe && { echo "$as_me:6511: WARNING: Cannot find GPM header" >&5
- echo "$as_me: WARNING: Cannot find GPM header" >&2;}
- 		with_gpm=no
- 
-@@ -6515,7 +6517,7 @@
- fi
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:6518: checking if you want to load GPM dynamically" >&5
-+	echo "$as_me:6520: 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.
-@@ -6525,18 +6527,18 @@
- else
-   with_dlsym=yes
- fi;
--	echo "$as_me:6528: result: $with_dlsym" >&5
-+	echo "$as_me:6530: result: $with_dlsym" >&5
- echo "${ECHO_T}$with_dlsym" >&6
- 	if test "x$with_dlsym" = xyes ; then
- 
- cf_have_dlsym=no
--echo "$as_me:6533: checking for dlsym" >&5
-+echo "$as_me:6535: 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 6539 "configure"
-+#line 6541 "configure"
- #include "confdefs.h"
- #define dlsym autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -6567,16 +6569,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6570: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6572: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6573: \$? = $ac_status" >&5
-+  echo "$as_me:6575: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6576: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6578: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6579: \$? = $ac_status" >&5
-+  echo "$as_me:6581: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_dlsym=yes
- else
-@@ -6586,14 +6588,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:6589: result: $ac_cv_func_dlsym" >&5
-+echo "$as_me:6591: 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:6596: checking for dlsym in -ldl" >&5
-+echo "$as_me:6598: 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
-@@ -6601,7 +6603,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6604 "configure"
-+#line 6606 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6620,16 +6622,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6623: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6625: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6626: \$? = $ac_status" >&5
-+  echo "$as_me:6628: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6629: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6631: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6632: \$? = $ac_status" >&5
-+  echo "$as_me:6634: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dl_dlsym=yes
- else
-@@ -6640,7 +6642,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6643: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "$as_me:6645: 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
- 
-@@ -6669,10 +6671,10 @@
- LIBS="$cf_add_libs"
-  }
- 
--	echo "$as_me:6672: checking whether able to link to dl*() functions" >&5
-+	echo "$as_me:6674: 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 6675 "configure"
-+#line 6677 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -6690,16 +6692,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6693: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6695: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6696: \$? = $ac_status" >&5
-+  echo "$as_me:6698: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6699: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6701: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6702: \$? = $ac_status" >&5
-+  echo "$as_me:6704: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- cat >>confdefs.h <<\EOF
-@@ -6710,15 +6712,15 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--		{ { echo "$as_me:6713: error: Cannot link test program for libdl" >&5
-+		{ { echo "$as_me:6715: 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:6718: result: ok" >&5
-+	echo "$as_me:6720: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- else
--	{ { echo "$as_me:6721: error: Cannot find dlsym function" >&5
-+	{ { echo "$as_me:6723: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -6726,12 +6728,12 @@
- 		if test "x$with_gpm" != xyes ; then
- 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
- 
--echo "${as_me:-configure}:6729: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me:-configure}:6731: testing assuming soname for gpm is $with_gpm ..." 1>&5
- 
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:6734: checking for soname of gpm library" >&5
-+echo "$as_me:6736: 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
-@@ -6765,15 +6767,15 @@
- done
- LIBS="$cf_add_libs"
- 
--	if { (eval echo "$as_me:6768: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:6770: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6771: \$? = $ac_status" >&5
-+  echo "$as_me:6773: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:6773: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:6775: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6776: \$? = $ac_status" >&5
-+  echo "$as_me:6778: \$? = $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
-@@ -6784,7 +6786,7 @@
- fi
- 
- fi
--echo "$as_me:6787: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:6789: result: $cf_cv_gpm_soname" >&5
- echo "${ECHO_T}$cf_cv_gpm_soname" >&6
- 
- 		fi
-@@ -6852,7 +6854,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--echo "$as_me:6855: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:6857: 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
-@@ -6860,7 +6862,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6863 "configure"
-+#line 6865 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6879,16 +6881,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6882: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6884: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6885: \$? = $ac_status" >&5
-+  echo "$as_me:6887: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6888: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6890: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6891: \$? = $ac_status" >&5
-+  echo "$as_me:6893: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -6899,11 +6901,11 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6902: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:6904: 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:6906: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:6908: 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
-@@ -6927,15 +6929,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:6930: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:6932: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6933: \$? = $ac_status" >&5
-+  echo "$as_me:6935: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:6935: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:6937: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6938: \$? = $ac_status" >&5
-+  echo "$as_me:6940: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'`
- 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -6947,11 +6949,11 @@
- fi
- 
- fi
--echo "$as_me:6950: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:6952: 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:6954: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+	{ echo "$as_me:6956: 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
- 
-@@ -6959,7 +6961,7 @@
- 
- fi
- 
--echo "$as_me:6962: checking if you want to use PCRE2 for regular-expressions" >&5
-+echo "$as_me:6964: checking if you want to use PCRE2 for regular-expressions" >&5
- echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
- 
- # Check whether --with-pcre2 or --without-pcre2 was given.
-@@ -6968,7 +6970,7 @@
- 
- fi;
- test -z "$with_pcre2" && with_pcre2=no
--echo "$as_me:6971: result: $with_pcre2" >&5
-+echo "$as_me:6973: result: $with_pcre2" >&5
- echo "${ECHO_T}$with_pcre2" >&6
- 
- if test "x$with_pcre2" != xno ; then
-@@ -6976,17 +6978,17 @@
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre2; then
- 	test -n "$verbose" && echo "	found package libpcre2" 1>&6
- 
--echo "${as_me:-configure}:6979: testing found package libpcre2 ..." 1>&5
-+echo "${as_me:-configure}:6981: testing found package libpcre2 ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre2 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre2 2>/dev/null`"
- 	test -n "$verbose" && echo "	package libpcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:6985: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:6987: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package libpcre2 LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:6989: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:6991: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -7110,17 +7112,17 @@
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then
- 	test -n "$verbose" && echo "	found package libpcre" 1>&6
- 
--echo "${as_me:-configure}:7113: testing found package libpcre ..." 1>&5
-+echo "${as_me:-configure}:7115: testing found package libpcre ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre 2>/dev/null`"
- 	test -n "$verbose" && echo "	package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:7119: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:7121: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package libpcre LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:7123: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:7125: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -7241,7 +7243,7 @@
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
- 
--			{ { echo "$as_me:7244: error: Cannot find PCRE2 library" >&5
-+			{ { echo "$as_me:7246: error: Cannot find PCRE2 library" >&5
- echo "$as_me: error: Cannot find PCRE2 library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7257,7 +7259,7 @@
- 	(*pcre2-posix*|*pcreposix*)
- 		;;
- 	(*)
--		echo "$as_me:7260: checking for regcomp in -lpcre2-posix" >&5
-+		echo "$as_me:7262: checking for regcomp in -lpcre2-posix" >&5
- echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
- if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7265,7 +7267,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpcre2-posix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7268 "configure"
-+#line 7270 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7284,16 +7286,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7289: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7290: \$? = $ac_status" >&5
-+  echo "$as_me:7292: \$? = $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:7295: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7296: \$? = $ac_status" >&5
-+  echo "$as_me:7298: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_pcre2_posix_regcomp=yes
- else
-@@ -7304,7 +7306,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:7307: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
-+echo "$as_me:7309: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
- echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
- if test $ac_cv_lib_pcre2_posix_regcomp = yes; then
- 
-@@ -7325,7 +7327,7 @@
- LIBS="$cf_add_libs"
- 
- else
--  echo "$as_me:7328: checking for regcomp in -lpcreposix" >&5
-+  echo "$as_me:7330: checking for regcomp in -lpcreposix" >&5
- echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
- if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7333,7 +7335,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpcreposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7336 "configure"
-+#line 7338 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7352,16 +7354,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7355: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7357: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7358: \$? = $ac_status" >&5
-+  echo "$as_me:7360: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7361: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7363: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7364: \$? = $ac_status" >&5
-+  echo "$as_me:7366: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_pcreposix_regcomp=yes
- else
-@@ -7372,7 +7374,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:7375: result: $ac_cv_lib_pcreposix_regcomp" >&5
-+echo "$as_me:7377: result: $ac_cv_lib_pcreposix_regcomp" >&5
- echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
- if test $ac_cv_lib_pcreposix_regcomp = yes; then
- 
-@@ -7393,7 +7395,7 @@
- LIBS="$cf_add_libs"
- 
- else
--  { { echo "$as_me:7396: error: Cannot find PCRE2 POSIX library" >&5
-+  { { echo "$as_me:7398: error: Cannot find PCRE2 POSIX library" >&5
- echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7408,23 +7410,23 @@
- for ac_header in pcre2-posix.h pcreposix.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:7411: checking for $ac_header" >&5
-+echo "$as_me:7413: 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 7417 "configure"
-+#line 7419 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:7421: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:7423: \"$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:7427: \$? = $ac_status" >&5
-+  echo "$as_me:7429: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -7443,7 +7445,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:7446: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:7448: 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 </dev/null ; then
--echo "$as_me:7460: checking if you want to use sysmouse" >&5
-+echo "$as_me:7462: 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.
-@@ -7469,7 +7471,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7472 "configure"
-+#line 7474 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -7492,16 +7494,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7495: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7497: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7498: \$? = $ac_status" >&5
-+  echo "$as_me:7500: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7501: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7503: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7504: \$? = $ac_status" >&5
-+  echo "$as_me:7506: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -7511,7 +7513,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	fi
--echo "$as_me:7514: result: $cf_with_sysmouse" >&5
-+echo "$as_me:7516: result: $cf_with_sysmouse" >&5
- echo "${ECHO_T}$cf_with_sysmouse" >&6
- test "$cf_with_sysmouse" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -7521,7 +7523,7 @@
- fi
- 
- # pretend that ncurses==ncursesw==ncursest
--echo "$as_me:7524: checking if you want to disable library suffixes" >&5
-+echo "$as_me:7526: checking if you want to disable library suffixes" >&5
- echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
- 
- # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
-@@ -7538,13 +7540,13 @@
- 	disable_lib_suffixes=no
- 
- fi;
--echo "$as_me:7541: result: $disable_lib_suffixes" >&5
-+echo "$as_me:7543: result: $disable_lib_suffixes" >&5
- echo "${ECHO_T}$disable_lib_suffixes" >&6
- 
- ### If we're building with rpath, try to link non-standard libs that way too.
- if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
- 
--echo "$as_me:7547: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:7549: checking if rpath-hack should be disabled" >&5
- echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-@@ -7561,21 +7563,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:7564: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:7566: result: $cf_disable_rpath_hack" >&5
- echo "${ECHO_T}$cf_disable_rpath_hack" >&6
- if test "$cf_disable_rpath_hack" = no ; then
- 
--echo "$as_me:7568: checking for updated LDFLAGS" >&5
-+echo "$as_me:7570: checking for updated LDFLAGS" >&5
- echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
- if test -n "$LD_RPATH_OPT" ; then
--	echo "$as_me:7571: result: maybe" >&5
-+	echo "$as_me:7573: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- 
- 	for ac_prog in ldd
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:7578: checking for $ac_word" >&5
-+echo "$as_me:7580: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7590,7 +7592,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_cf_ldd_prog="$ac_prog"
--echo "$as_me:7593: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7595: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -7598,10 +7600,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:7601: result: $cf_ldd_prog" >&5
-+  echo "$as_me:7603: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:7604: result: no" >&5
-+  echo "$as_me:7606: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -7615,7 +7617,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7618 "configure"
-+#line 7620 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -7627,16 +7629,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7630: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7632: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7633: \$? = $ac_status" >&5
-+  echo "$as_me:7635: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7636: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7638: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7639: \$? = $ac_status" >&5
-+  echo "$as_me:7641: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
- 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
-@@ -7664,7 +7666,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:7667: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:7669: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -7676,11 +7678,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:7679: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:7681: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:7683: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:7685: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -7717,7 +7719,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:7720: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:7722: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -7730,11 +7732,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:7733: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:7735: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:7737: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:7739: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -7771,7 +7773,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:7774: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:7776: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -7784,14 +7786,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:7787: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:7789: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:7791: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:7793: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:7794: result: no" >&5
-+	echo "$as_me:7796: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -7802,7 +7804,7 @@
- ###############################################################################
- 
- ###	use option --with-extra-suffix to append suffix to headers and libraries
--echo "$as_me:7805: checking if you wish to append extra suffix to header/library paths" >&5
-+echo "$as_me:7807: checking if you wish to append extra suffix to header/library paths" >&5
- echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
- EXTRA_SUFFIX=
- 
-@@ -7821,11 +7823,11 @@
- 	esac
- 
- fi;
--echo "$as_me:7824: result: $EXTRA_SUFFIX" >&5
-+echo "$as_me:7826: result: $EXTRA_SUFFIX" >&5
- echo "${ECHO_T}$EXTRA_SUFFIX" >&6
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:7828: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:7830: 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.
-@@ -7835,10 +7837,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:7838: result: $with_overwrite" >&5
-+echo "$as_me:7840: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:7841: checking if external terminfo-database is used" >&5
-+echo "$as_me:7843: 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.
-@@ -7848,7 +7850,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:7851: result: $use_database" >&5
-+echo "$as_me:7853: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in
-@@ -7864,7 +7866,7 @@
- if test "$use_database" != no ; then
- 	NCURSES_USE_DATABASE=1
- 
--	echo "$as_me:7867: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:7869: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --with-database or --without-database was given.
-@@ -7872,10 +7874,10 @@
-   withval="$with_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:7875: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:7877: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:7878: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:7880: 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.
-@@ -7885,13 +7887,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:7888: result: $with_hashed_db" >&5
-+	echo "$as_me:7890: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:7894: checking for list of fallback descriptions" >&5
-+echo "$as_me:7896: 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.
-@@ -7901,7 +7903,7 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:7904: result: $with_fallback" >&5
-+echo "$as_me:7906: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- 
- case ".$with_fallback" in
-@@ -7909,7 +7911,7 @@
- 	FALLBACK_LIST=
- 	;;
- (.yes)
--	{ echo "$as_me:7912: WARNING: expected a list of terminal descriptions" >&5
-+	{ echo "$as_me:7914: WARNING: expected a list of terminal descriptions" >&5
- echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
- 	;;
- (*)
-@@ -7920,7 +7922,336 @@
- USE_FALLBACKS=
- test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
- 
--echo "$as_me:7923: checking if you want modern xterm or antique" >&5
-+# The fallback feature in ncurses relies upon tic/infocmp outside the build
-+# tree for generating the terminal descriptions that will be compiled into the
-+# library.  If your toolchain is old, it may not handle current terminal
-+# databases.  Use configure-options to point to the tools which will be used,
-+# rather than the first ones found on the $PATH.
-+if test -n "$FALLBACK_LIST"
-+then
-+
-+# Check whether --with-tic-path or --without-tic-path was given.
-+if test "${with_tic_path+set}" = set; then
-+  withval="$with_tic_path"
-+  echo "$as_me:7936: checking for tic program for fallbacks" >&5
-+echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
-+		TIC=$withval
-+		echo "$as_me:7939: result: $TIC" >&5
-+echo "${ECHO_T}$TIC" >&6
-+
-+if test "x$prefix" != xNONE; then
-+	cf_path_syntax="$prefix"
-+else
-+	cf_path_syntax="$ac_default_prefix"
-+fi
-+
-+case ".$TIC" in
-+(.\$\(*\)*|.\'*\'*)
-+	;;
-+(..|./*|.\\*)
-+	;;
-+(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-+	;;
-+(.\${*prefix}*|.\${*dir}*)
-+	eval TIC="$TIC"
-+	case ".$TIC" in
-+	(.NONE/*)
-+		TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
-+		;;
-+	esac
-+	;;
-+(.no|.NONE/*)
-+	TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
-+	;;
-+(*)
-+	{ { echo "$as_me:7967: error: expected a pathname, not \"$TIC\"" >&5
-+echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
-+   { (exit 1); exit 1; }; }
-+	;;
-+esac
-+
-+else
-+
-+test -z "$TIC" && TIC=tic
-+for ac_prog in $TIC tic
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:7980: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_TIC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $TIC in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_TIC="$TIC" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH:/usr/local/ncurses/bin"
-+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_TIC="$ac_dir/$ac_word"
-+   echo "$as_me:7997: found $ac_dir/$ac_word" >&5
-+   break
-+fi
-+done
-+
-+  ;;
-+esac
-+fi
-+TIC=$ac_cv_path_TIC
-+
-+if test -n "$TIC"; then
-+  echo "$as_me:8008: result: $TIC" >&5
-+echo "${ECHO_T}$TIC" >&6
-+else
-+  echo "$as_me:8011: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  test -n "$TIC" && break
-+done
-+test -n "$TIC" || TIC="$TIC"
-+
-+cf_path_prog=""
-+cf_path_args=""
-+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
-+for cf_temp in $ac_cv_path_TIC
-+do
-+	if test -z "$cf_path_prog" ; then
-+		if test "$with_full_paths" = yes ; then
-+
-+if test "x$prefix" != xNONE; then
-+	cf_path_syntax="$prefix"
-+else
-+	cf_path_syntax="$ac_default_prefix"
-+fi
-+
-+case ".$cf_temp" in
-+(.\$\(*\)*|.\'*\'*)
-+	;;
-+(..|./*|.\\*)
-+	;;
-+(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-+	;;
-+(.\${*prefix}*|.\${*dir}*)
-+	eval cf_temp="$cf_temp"
-+	case ".$cf_temp" in
-+	(.NONE/*)
-+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-+		;;
-+	esac
-+	;;
-+(.no|.NONE/*)
-+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-+	;;
-+(*)
-+	break
-+	;;
-+esac
-+
-+			cf_path_prog="$cf_temp"
-+		else
-+			cf_path_prog="`basename $cf_temp`"
-+		fi
-+	elif test -z "$cf_path_args" ; then
-+		cf_path_args="$cf_temp"
-+	else
-+		cf_path_args="$cf_path_args $cf_temp"
-+	fi
-+done
-+IFS="$cf_save_ifs"
-+
-+if test -n "$cf_path_prog" ; then
-+
-+echo "${as_me:-configure}:8070: testing defining path for ${cf_path_prog} ..." 1>&5
-+
-+cat >>confdefs.h <>confdefs.h <&5
-+echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
-+		fi
-+
-+fi;
-+
-+# Check whether --with-infocmp-path or --without-infocmp-path was given.
-+if test "${with_infocmp_path+set}" = set; then
-+  withval="$with_infocmp_path"
-+  echo "$as_me:8094: checking for infocmp program for fallbacks" >&5
-+echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
-+		INFOCMP=$withval
-+		echo "$as_me:8097: result: $INFOCMP" >&5
-+echo "${ECHO_T}$INFOCMP" >&6
-+
-+if test "x$prefix" != xNONE; then
-+	cf_path_syntax="$prefix"
-+else
-+	cf_path_syntax="$ac_default_prefix"
-+fi
-+
-+case ".$INFOCMP" in
-+(.\$\(*\)*|.\'*\'*)
-+	;;
-+(..|./*|.\\*)
-+	;;
-+(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-+	;;
-+(.\${*prefix}*|.\${*dir}*)
-+	eval INFOCMP="$INFOCMP"
-+	case ".$INFOCMP" in
-+	(.NONE/*)
-+		INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
-+		;;
-+	esac
-+	;;
-+(.no|.NONE/*)
-+	INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
-+	;;
-+(*)
-+	{ { echo "$as_me:8125: error: expected a pathname, not \"$INFOCMP\"" >&5
-+echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
-+   { (exit 1); exit 1; }; }
-+	;;
-+esac
-+
-+else
-+
-+test -z "$INFOCMP" && INFOCMP=infocmp
-+for ac_prog in $INFOCMP infocmp
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:8138: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_INFOCMP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $INFOCMP in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_INFOCMP="$INFOCMP" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH:/usr/local/ncurses/bin"
-+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_INFOCMP="$ac_dir/$ac_word"
-+   echo "$as_me:8155: found $ac_dir/$ac_word" >&5
-+   break
-+fi
-+done
-+
-+  ;;
-+esac
-+fi
-+INFOCMP=$ac_cv_path_INFOCMP
-+
-+if test -n "$INFOCMP"; then
-+  echo "$as_me:8166: result: $INFOCMP" >&5
-+echo "${ECHO_T}$INFOCMP" >&6
-+else
-+  echo "$as_me:8169: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  test -n "$INFOCMP" && break
-+done
-+test -n "$INFOCMP" || INFOCMP="$INFOCMP"
-+
-+cf_path_prog=""
-+cf_path_args=""
-+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
-+for cf_temp in $ac_cv_path_INFOCMP
-+do
-+	if test -z "$cf_path_prog" ; then
-+		if test "$with_full_paths" = yes ; then
-+
-+if test "x$prefix" != xNONE; then
-+	cf_path_syntax="$prefix"
-+else
-+	cf_path_syntax="$ac_default_prefix"
-+fi
-+
-+case ".$cf_temp" in
-+(.\$\(*\)*|.\'*\'*)
-+	;;
-+(..|./*|.\\*)
-+	;;
-+(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-+	;;
-+(.\${*prefix}*|.\${*dir}*)
-+	eval cf_temp="$cf_temp"
-+	case ".$cf_temp" in
-+	(.NONE/*)
-+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-+		;;
-+	esac
-+	;;
-+(.no|.NONE/*)
-+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
-+	;;
-+(*)
-+	break
-+	;;
-+esac
-+
-+			cf_path_prog="$cf_temp"
-+		else
-+			cf_path_prog="`basename $cf_temp`"
-+		fi
-+	elif test -z "$cf_path_args" ; then
-+		cf_path_args="$cf_temp"
-+	else
-+		cf_path_args="$cf_path_args $cf_temp"
-+	fi
-+done
-+IFS="$cf_save_ifs"
-+
-+if test -n "$cf_path_prog" ; then
-+
-+echo "${as_me:-configure}:8228: testing defining path for ${cf_path_prog} ..." 1>&5
-+
-+cat >>confdefs.h <>confdefs.h <&5
-+echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
-+		fi
-+
-+fi;
-+
-+else
-+	: ${TIC:=tic}
-+	: ${INFOCMP:=infocmp}
-+fi
-+
-+echo "$as_me:8254: 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.
-@@ -7934,11 +8265,11 @@
- (no) with_xterm_new=xterm-old;;
- (*)	 with_xterm_new=xterm-new;;
- esac
--echo "$as_me:7937: result: $with_xterm_new" >&5
-+echo "$as_me:8268: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
--echo "$as_me:7941: checking if xterm backspace sends BS or DEL" >&5
-+echo "$as_me:8272: checking if xterm backspace sends BS or DEL" >&5
- echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
- 
- # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
-@@ -7959,7 +8290,7 @@
- 	with_xterm_kbs=$withval
- 	;;
- esac
--echo "$as_me:7962: result: $with_xterm_kbs" >&5
-+echo "$as_me:8293: result: $with_xterm_kbs" >&5
- echo "${ECHO_T}$with_xterm_kbs" >&6
- XTERM_KBS=$with_xterm_kbs
- 
-@@ -7969,7 +8300,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:7972: checking for list of terminfo directories" >&5
-+echo "$as_me:8303: 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.
-@@ -8009,7 +8340,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:8012: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:8343: 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; }; }
- 	;;
-@@ -8032,7 +8363,7 @@
- 	;;
- esac
- 
--echo "$as_me:8035: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:8366: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" &&
- cat >>confdefs.h <&5
-+	{ echo "$as_me:8375: WARNING: ignoring non-directory/file TERMINFO value" >&5
- echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
- 	unset TERMINFO
- 	;;
- esac
- 
--echo "$as_me:8050: checking for default terminfo directory" >&5
-+echo "$as_me:8381: 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.
-@@ -8083,7 +8414,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:8086: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:8417: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -8092,7 +8423,7 @@
- fi
- eval TERMINFO="$withval"
- 
--echo "$as_me:8095: result: $TERMINFO" >&5
-+echo "$as_me:8426: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:8437: 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.
-@@ -8115,7 +8446,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8118 "configure"
-+#line 8449 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8129,15 +8460,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8132: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8463: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8135: \$? = $ac_status" >&5
-+  echo "$as_me:8466: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8137: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8468: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8140: \$? = $ac_status" >&5
-+  echo "$as_me:8471: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -8149,7 +8480,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi;
--echo "$as_me:8152: result: $with_big_core" >&5
-+echo "$as_me:8483: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "x$with_big_core" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -8159,7 +8490,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:8162: checking if big-strings option selected" >&5
-+echo "$as_me:8493: 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.
-@@ -8183,14 +8514,14 @@
- 	esac
- 
- fi;
--echo "$as_me:8186: result: $with_big_strings" >&5
-+echo "$as_me:8517: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
- 
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:8193: checking if you want termcap-fallback support" >&5
-+echo "$as_me:8524: 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.
-@@ -8200,14 +8531,14 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:8203: result: $with_termcap" >&5
-+echo "$as_me:8534: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- NCURSES_USE_TERMCAP=0
- if test "x$with_termcap" != "xyes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:8210: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:8541: 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
-@@ -8220,13 +8551,13 @@
- else
- 
- 	if test "$with_ticlib" != no ; then
--		{ { echo "$as_me:8223: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+		{ { echo "$as_me:8554: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
- echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 
- 	NCURSES_USE_TERMCAP=1
--	echo "$as_me:8229: checking for list of termcap files" >&5
-+	echo "$as_me:8560: 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.
-@@ -8266,7 +8597,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:8269: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:8600: 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; }; }
- 	;;
-@@ -8289,7 +8620,7 @@
- 	;;
- esac
- 
--	echo "$as_me:8292: result: $TERMPATH" >&5
-+	echo "$as_me:8623: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- 	test -n "$TERMPATH" &&
- cat >>confdefs.h <&5
-+	echo "$as_me:8631: 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.
-@@ -8307,14 +8638,14 @@
- else
-   with_getcap=no
- fi;
--	echo "$as_me:8310: result: $with_getcap" >&5
-+	echo "$as_me:8641: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- 	test "x$with_getcap" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--	echo "$as_me:8317: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+	echo "$as_me:8648: 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.
-@@ -8324,7 +8655,7 @@
- else
-   with_getcap_cache=no
- fi;
--	echo "$as_me:8327: result: $with_getcap_cache" >&5
-+	echo "$as_me:8658: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- 	test "x$with_getcap_cache" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -8334,7 +8665,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:8337: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:8668: 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.
-@@ -8344,14 +8675,14 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:8347: result: $with_home_terminfo" >&5
-+echo "$as_me:8678: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "x$with_home_terminfo" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:8354: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:8685: 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.
-@@ -8361,7 +8692,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:8364: result: $with_root_environ" >&5
-+echo "$as_me:8695: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "x$with_root_environ" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -8376,23 +8707,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:8379: checking for $ac_header" >&5
-+echo "$as_me:8710: 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 8385 "configure"
-+#line 8716 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:8389: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:8720: \"$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:8395: \$? = $ac_status" >&5
-+  echo "$as_me:8726: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -8411,7 +8742,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:8414: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:8745: 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 <&5
-+echo "$as_me:8760: 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 8435 "configure"
-+#line 8766 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -8463,16 +8794,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8466: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8797: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8469: \$? = $ac_status" >&5
-+  echo "$as_me:8800: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8472: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8803: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8475: \$? = $ac_status" >&5
-+  echo "$as_me:8806: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -8482,7 +8813,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:8485: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:8816: 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 <&5
-+echo "$as_me:8833: 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 8508 "configure"
-+#line 8839 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -8536,16 +8867,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8539: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8870: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8542: \$? = $ac_status" >&5
-+  echo "$as_me:8873: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8545: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8876: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8548: \$? = $ac_status" >&5
-+  echo "$as_me:8879: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -8555,7 +8886,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:8558: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:8889: 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 <&5
-+	echo "$as_me:8900: 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
-@@ -8579,7 +8910,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8582 "configure"
-+#line 8913 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -8609,15 +8940,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8612: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8943: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8615: \$? = $ac_status" >&5
-+  echo "$as_me:8946: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8617: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8948: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8620: \$? = $ac_status" >&5
-+  echo "$as_me:8951: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -8635,7 +8966,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--echo "$as_me:8638: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:8969: result: $cf_cv_link_funcs" >&5
- echo "${ECHO_T}$cf_cv_link_funcs" >&6
- 	test "$ac_cv_func_link"    = yes &&
- cat >>confdefs.h <<\EOF
-@@ -8655,7 +8986,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 "x$ac_cv_func_symlink" = xyes ; then
--	echo "$as_me:8658: checking if tic should use symbolic links" >&5
-+	echo "$as_me:8989: 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.
-@@ -8665,21 +8996,21 @@
- else
-   with_symlinks=no
- fi;
--	echo "$as_me:8668: result: $with_symlinks" >&5
-+	echo "$as_me:8999: 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:8675: checking if tic should use hard links" >&5
-+	echo "$as_me:9006: checking if tic should use hard links" >&5
- echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
- 	if test "x$ac_cv_func_link" = xyes ; then
- 		with_links=yes
- 	else
- 		with_links=no
- 	fi
--	echo "$as_me:8682: result: $with_links" >&5
-+	echo "$as_me:9013: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -8694,7 +9025,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:8697: checking if you want broken-linker support code" >&5
-+echo "$as_me:9028: 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.
-@@ -8704,7 +9035,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:8707: result: $with_broken_linker" >&5
-+echo "$as_me:9038: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -8726,14 +9057,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:8729: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:9060: 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:8736: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:9067: 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.
-@@ -8743,7 +9074,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:8746: result: $with_bsdpad" >&5
-+echo "$as_me:9077: result: $with_bsdpad" >&5
- echo "${ECHO_T}$with_bsdpad" >&6
- test "x$with_bsdpad" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -8762,14 +9093,14 @@
- # Check to define _XOPEN_SOURCE "automatically"
- CPPFLAGS_before_XOPEN="$CPPFLAGS"
- 
--echo "$as_me:8765: checking if the POSIX test-macros are already defined" >&5
-+echo "$as_me:9096: checking if the POSIX test-macros are already defined" >&5
- echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
- if test "${cf_cv_posix_visible+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 8772 "configure"
-+#line 9103 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8788,16 +9119,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8791: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9122: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8794: \$? = $ac_status" >&5
-+  echo "$as_me:9125: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8797: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9128: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8800: \$? = $ac_status" >&5
-+  echo "$as_me:9131: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_visible=no
- else
-@@ -8808,7 +9139,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8811: result: $cf_cv_posix_visible" >&5
-+echo "$as_me:9142: result: $cf_cv_posix_visible" >&5
- echo "${ECHO_T}$cf_cv_posix_visible" >&6
- 
- if test "$cf_cv_posix_visible" = no; then
-@@ -8853,14 +9184,14 @@
- 
- cf_gnu_xopen_source=$cf_XOPEN_SOURCE
- 
--echo "$as_me:8856: checking if this is the GNU C library" >&5
-+echo "$as_me:9187: checking if this is the GNU C library" >&5
- echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
- if test "${cf_cv_gnu_library+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 8863 "configure"
-+#line 9194 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8879,16 +9210,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8882: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9213: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8885: \$? = $ac_status" >&5
-+  echo "$as_me:9216: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8888: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9219: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8891: \$? = $ac_status" >&5
-+  echo "$as_me:9222: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_library=yes
- else
-@@ -8899,7 +9230,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8902: result: $cf_cv_gnu_library" >&5
-+echo "$as_me:9233: result: $cf_cv_gnu_library" >&5
- echo "${ECHO_T}$cf_cv_gnu_library" >&6
- 
- if test x$cf_cv_gnu_library = xyes; then
-@@ -8907,7 +9238,7 @@
- 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
- 	# was changed to help a little.  newlib incorporated the change about 4
- 	# years later.
--	echo "$as_me:8910: checking if _DEFAULT_SOURCE can be used as a basis" >&5
-+	echo "$as_me:9241: checking if _DEFAULT_SOURCE can be used as a basis" >&5
- echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
- if test "${cf_cv_gnu_library_219+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8919,7 +9250,7 @@
- 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8922 "configure"
-+#line 9253 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -8938,16 +9269,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8941: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9272: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8944: \$? = $ac_status" >&5
-+  echo "$as_me:9275: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8947: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9278: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8950: \$? = $ac_status" >&5
-+  echo "$as_me:9281: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_library_219=yes
- else
-@@ -8959,12 +9290,12 @@
- 		CPPFLAGS="$cf_save"
- 
- fi
--echo "$as_me:8962: result: $cf_cv_gnu_library_219" >&5
-+echo "$as_me:9293: result: $cf_cv_gnu_library_219" >&5
- echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
- 
- 	if test "x$cf_cv_gnu_library_219" = xyes; then
- 		cf_save="$CPPFLAGS"
--		echo "$as_me:8967: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
-+		echo "$as_me:9298: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9069,7 +9400,7 @@
- fi
- 
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9072 "configure"
-+#line 9403 "configure"
- #include "confdefs.h"
- 
- 				#include 
-@@ -9089,16 +9420,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9092: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9423: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9095: \$? = $ac_status" >&5
-+  echo "$as_me:9426: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9098: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9429: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9101: \$? = $ac_status" >&5
-+  echo "$as_me:9432: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_dftsrc_219=yes
- else
-@@ -9109,7 +9440,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9112: result: $cf_cv_gnu_dftsrc_219" >&5
-+echo "$as_me:9443: result: $cf_cv_gnu_dftsrc_219" >&5
- echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
- 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
- 	else
-@@ -9118,14 +9449,14 @@
- 
- 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
- 
--		echo "$as_me:9121: checking if we must define _GNU_SOURCE" >&5
-+		echo "$as_me:9452: 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 9128 "configure"
-+#line 9459 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9140,16 +9471,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9143: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9474: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9146: \$? = $ac_status" >&5
-+  echo "$as_me:9477: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9149: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9480: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9152: \$? = $ac_status" >&5
-+  echo "$as_me:9483: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9256,7 +9587,7 @@
- fi
- 
- 			 cat >conftest.$ac_ext <<_ACEOF
--#line 9259 "configure"
-+#line 9590 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9271,16 +9602,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9274: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9605: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9277: \$? = $ac_status" >&5
-+  echo "$as_me:9608: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9280: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9611: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9283: \$? = $ac_status" >&5
-+  echo "$as_me:9614: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9295,12 +9626,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9298: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:9629: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- 
- 		if test "$cf_cv_gnu_source" = yes
- 		then
--		echo "$as_me:9303: checking if we should also define _DEFAULT_SOURCE" >&5
-+		echo "$as_me:9634: checking if we should also define _DEFAULT_SOURCE" >&5
- echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_default_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9310,7 +9641,7 @@
- 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
- 
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9313 "configure"
-+#line 9644 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9325,16 +9656,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9328: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9659: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9331: \$? = $ac_status" >&5
-+  echo "$as_me:9662: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9334: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9665: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9337: \$? = $ac_status" >&5
-+  echo "$as_me:9668: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_default_source=no
- else
-@@ -9345,7 +9676,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9348: result: $cf_cv_default_source" >&5
-+echo "$as_me:9679: result: $cf_cv_default_source" >&5
- echo "${ECHO_T}$cf_cv_default_source" >&6
- 			if test "$cf_cv_default_source" = yes
- 			then
-@@ -9382,16 +9713,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:9385: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:9716: 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}:9391: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:9722: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9394 "configure"
-+#line 9725 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9406,16 +9737,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9409: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9740: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9412: \$? = $ac_status" >&5
-+  echo "$as_me:9743: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9415: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9746: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9418: \$? = $ac_status" >&5
-+  echo "$as_me:9749: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -9436,7 +9767,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9439 "configure"
-+#line 9770 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9451,16 +9782,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9454: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9785: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9457: \$? = $ac_status" >&5
-+  echo "$as_me:9788: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9460: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9791: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9463: \$? = $ac_status" >&5
-+  echo "$as_me:9794: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9471,7 +9802,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:9474: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:9805: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS"
-@@ -9479,10 +9810,10 @@
- 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
- 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:9482: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:9813: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9485 "configure"
-+#line 9816 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9497,16 +9828,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9500: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9831: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9503: \$? = $ac_status" >&5
-+  echo "$as_me:9834: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9506: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9837: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9509: \$? = $ac_status" >&5
-+  echo "$as_me:9840: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9522,7 +9853,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9525: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:9856: 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
-@@ -9662,14 +9993,14 @@
- 	;;
- (*)
- 
--echo "$as_me:9665: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:9996: 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 9672 "configure"
-+#line 10003 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9688,16 +10019,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9691: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10022: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9694: \$? = $ac_status" >&5
-+  echo "$as_me:10025: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9697: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10028: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9700: \$? = $ac_status" >&5
-+  echo "$as_me:10031: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -9709,7 +10040,7 @@
- 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9712 "configure"
-+#line 10043 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -9728,16 +10059,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9731: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10062: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9734: \$? = $ac_status" >&5
-+  echo "$as_me:10065: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9737: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10068: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9740: \$? = $ac_status" >&5
-+  echo "$as_me:10071: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -9752,7 +10083,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9755: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10086: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -9882,16 +10213,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:9885: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:10216: 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}:9891: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:10222: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9894 "configure"
-+#line 10225 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9906,16 +10237,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9909: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10240: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9912: \$? = $ac_status" >&5
-+  echo "$as_me:10243: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9915: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10246: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9918: \$? = $ac_status" >&5
-+  echo "$as_me:10249: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -9936,7 +10267,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9939 "configure"
-+#line 10270 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9951,16 +10282,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9954: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9957: \$? = $ac_status" >&5
-+  echo "$as_me:10288: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9960: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10291: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9963: \$? = $ac_status" >&5
-+  echo "$as_me:10294: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9971,7 +10302,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:9974: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:10305: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS"
-@@ -9979,10 +10310,10 @@
- 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
- 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:9982: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:10313: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9985 "configure"
-+#line 10316 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -9997,16 +10328,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10000: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10331: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10003: \$? = $ac_status" >&5
-+  echo "$as_me:10334: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10006: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10337: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10009: \$? = $ac_status" >&5
-+  echo "$as_me:10340: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10022,7 +10353,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10025: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:10356: 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
-@@ -10216,7 +10547,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:10219: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:10550: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
- 	CFLAGS="${CFLAGS}$cf_new_cflags"
-@@ -10226,7 +10557,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:10229: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10560: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
- 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
-@@ -10236,7 +10567,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:10239: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10570: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
- 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
-@@ -10246,10 +10577,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:10249: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:10580: checking if _XOPEN_SOURCE really is set" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10252 "configure"
-+#line 10583 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10264,16 +10595,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10267: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10598: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10270: \$? = $ac_status" >&5
-+  echo "$as_me:10601: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10273: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10604: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10276: \$? = $ac_status" >&5
-+  echo "$as_me:10607: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -10282,12 +10613,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:10285: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:10616: result: $cf_XOPEN_SOURCE_set" >&5
- echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
- 	if test $cf_XOPEN_SOURCE_set = yes
- 	then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10290 "configure"
-+#line 10621 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10302,16 +10633,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10305: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10636: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10308: \$? = $ac_status" >&5
-+  echo "$as_me:10639: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10311: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10642: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10314: \$? = $ac_status" >&5
-+  echo "$as_me:10645: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -10322,19 +10653,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:10325: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:10656: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:10330: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10661: 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 10337 "configure"
-+#line 10668 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10353,16 +10684,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10356: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10687: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10359: \$? = $ac_status" >&5
-+  echo "$as_me:10690: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10362: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10693: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10365: \$? = $ac_status" >&5
-+  echo "$as_me:10696: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10374,7 +10705,7 @@
- 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10377 "configure"
-+#line 10708 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10393,16 +10724,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10396: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10727: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10399: \$? = $ac_status" >&5
-+  echo "$as_me:10730: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10402: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10733: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10405: \$? = $ac_status" >&5
-+  echo "$as_me:10736: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10417,7 +10748,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10420: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10751: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10540,14 +10871,14 @@
- 
- # Work around breakage on OS X
- 
--echo "$as_me:10543: checking if SIGWINCH is defined" >&5
-+echo "$as_me:10874: 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 10550 "configure"
-+#line 10881 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10562,23 +10893,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10565: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10896: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10568: \$? = $ac_status" >&5
-+  echo "$as_me:10899: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10571: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10902: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10574: \$? = $ac_status" >&5
-+  echo "$as_me:10905: \$? = $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 10581 "configure"
-+#line 10912 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -10596,16 +10927,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10599: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10930: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10602: \$? = $ac_status" >&5
-+  echo "$as_me:10933: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10605: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10936: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10608: \$? = $ac_status" >&5
-+  echo "$as_me:10939: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -10619,11 +10950,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10622: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:10953: 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:10626: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:10957: 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
-@@ -10634,7 +10965,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10637 "configure"
-+#line 10968 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -10656,16 +10987,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10990: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10662: \$? = $ac_status" >&5
-+  echo "$as_me:10993: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10665: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10996: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10668: \$? = $ac_status" >&5
-+  echo "$as_me:10999: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -10679,7 +11010,7 @@
- done
- 
- fi
--echo "$as_me:10682: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:11013: result: $cf_cv_fixup_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
- 
- 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -10689,13 +11020,13 @@
- 
- # Checks for CODESET support.
- 
--echo "$as_me:10692: checking for nl_langinfo and CODESET" >&5
-+echo "$as_me:11023: 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 10698 "configure"
-+#line 11029 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -10707,16 +11038,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10710: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11041: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10713: \$? = $ac_status" >&5
-+  echo "$as_me:11044: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10716: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11047: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10719: \$? = $ac_status" >&5
-+  echo "$as_me:11050: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -10727,7 +11058,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:10730: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:11061: result: $am_cv_langinfo_codeset" >&5
- echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
- 	if test $am_cv_langinfo_codeset = yes; then
- 
-@@ -10741,7 +11072,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--echo "$as_me:10744: checking if you want wide-character code" >&5
-+echo "$as_me:11075: 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.
-@@ -10751,7 +11082,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:10754: result: $with_widec" >&5
-+echo "$as_me:11085: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- 
- NCURSES_WCWIDTH_GRAPHICS=1
-@@ -10775,23 +11106,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:10778: checking for $ac_header" >&5
-+echo "$as_me:11109: 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 10784 "configure"
-+#line 11115 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:10788: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11119: \"$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:10794: \$? = $ac_status" >&5
-+  echo "$as_me:11125: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10810,7 +11141,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:10813: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11144: 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 <&5
-+echo "$as_me:11154: checking if wchar.h can be used as is" >&5
- echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
- if test "${cf_cv_wchar_h_okay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10830 "configure"
-+#line 11161 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -10849,16 +11180,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10852: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11183: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10855: \$? = $ac_status" >&5
-+  echo "$as_me:11186: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10858: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11189: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10861: \$? = $ac_status" >&5
-+  echo "$as_me:11192: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_h_okay=yes
- else
-@@ -10868,16 +11199,16 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10871: result: $cf_cv_wchar_h_okay" >&5
-+echo "$as_me:11202: result: $cf_cv_wchar_h_okay" >&5
- echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
- 
- if test $cf_cv_wchar_h_okay = no
- then
- 
--echo "$as_me:10877: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:11208: 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 10880 "configure"
-+#line 11211 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -10893,16 +11224,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10896: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10899: \$? = $ac_status" >&5
-+  echo "$as_me:11230: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10902: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11233: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10905: \$? = $ac_status" >&5
-+  echo "$as_me:11236: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -10911,16 +11242,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:10914: result: $cf_result" >&5
-+echo "$as_me:11245: 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:10920: checking checking for compatible value versus " >&5
-+	echo "$as_me:11251: 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 10923 "configure"
-+#line 11254 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -10936,16 +11267,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10939: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11270: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10942: \$? = $ac_status" >&5
-+  echo "$as_me:11273: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10945: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11276: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10948: \$? = $ac_status" >&5
-+  echo "$as_me:11279: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -10954,7 +11285,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:10957: result: $cf_result" >&5
-+	echo "$as_me:11288: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -10964,7 +11295,7 @@
- 
- fi
- 
--echo "$as_me:10967: checking if wcwidth agrees graphics are single-width" >&5
-+echo "$as_me:11298: checking if wcwidth agrees graphics are single-width" >&5
- echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
- if test "${cf_cv_wcwidth_graphics+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11035,7 +11366,7 @@
-   cf_cv_wcwidth_graphics=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11038 "configure"
-+#line 11369 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11079,15 +11410,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11082: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11413: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11085: \$? = $ac_status" >&5
-+  echo "$as_me:11416: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11087: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11418: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11090: \$? = $ac_status" >&5
-+  echo "$as_me:11421: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wcwidth_graphics=yes
- else
-@@ -11100,7 +11431,7 @@
- fi
- 
- fi
--echo "$as_me:11103: result: $cf_cv_wcwidth_graphics" >&5
-+echo "$as_me:11434: result: $cf_cv_wcwidth_graphics" >&5
- echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
- 
- 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
-@@ -11111,13 +11442,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:11114: checking for $ac_func" >&5
-+echo "$as_me:11445: 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 11120 "configure"
-+#line 11451 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -11148,16 +11479,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11151: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11482: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11154: \$? = $ac_status" >&5
-+  echo "$as_me:11485: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11157: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11488: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11160: \$? = $ac_status" >&5
-+  echo "$as_me:11491: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -11167,7 +11498,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11170: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:11501: 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 <&5
-+echo "$as_me:11513: 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
-@@ -11187,7 +11518,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 11190 "configure"
-+#line 11521 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11200,16 +11531,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11203: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11534: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11206: \$? = $ac_status" >&5
-+  echo "$as_me:11537: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11209: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11540: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11212: \$? = $ac_status" >&5
-+  echo "$as_me:11543: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -11221,12 +11552,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:11224: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:11555: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11229 "configure"
-+#line 11560 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11239,16 +11570,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11242: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11573: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11245: \$? = $ac_status" >&5
-+  echo "$as_me:11576: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11248: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11579: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11251: \$? = $ac_status" >&5
-+  echo "$as_me:11582: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -11262,7 +11593,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11265 "configure"
-+#line 11596 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11275,16 +11606,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11278: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11609: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11281: \$? = $ac_status" >&5
-+  echo "$as_me:11612: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11284: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11615: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11287: \$? = $ac_status" >&5
-+  echo "$as_me:11618: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -11301,9 +11632,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:11304: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:11635: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:11306: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:11637: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -11394,7 +11725,7 @@
- 		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}:11397: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:11728: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
- 
- 			CPPFLAGS="$cf_save_CPPFLAGS"
- 
-@@ -11402,7 +11733,7 @@
- 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
- 
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 11405 "configure"
-+#line 11736 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11415,21 +11746,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11418: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11749: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11421: \$? = $ac_status" >&5
-+  echo "$as_me:11752: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11424: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11755: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11427: \$? = $ac_status" >&5
-+  echo "$as_me:11758: \$? = $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}:11432: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:11763: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -11447,7 +11778,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:11450: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:11781: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -11522,13 +11853,13 @@
- 				if test -d $cf_cv_library_path_utf8 ; then
- 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:11525: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:11856: 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 11531 "configure"
-+#line 11862 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11541,21 +11872,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11544: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11547: \$? = $ac_status" >&5
-+  echo "$as_me:11878: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11550: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11553: \$? = $ac_status" >&5
-+  echo "$as_me:11884: \$? = $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}:11558: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:11889: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -11597,7 +11928,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11600: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:11931: 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
-@@ -11635,7 +11966,7 @@
- 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
- 
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 11638 "configure"
-+#line 11969 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -11647,16 +11978,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11650: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11981: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11653: \$? = $ac_status" >&5
-+  echo "$as_me:11984: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11656: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11987: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11659: \$? = $ac_status" >&5
-+  echo "$as_me:11990: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -11673,7 +12004,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:11676: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:12007: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -11709,7 +12040,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}:11712: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:12043: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -11741,14 +12072,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:11744: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:12075: 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 11751 "configure"
-+#line 12082 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11766,23 +12097,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11769: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12100: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11772: \$? = $ac_status" >&5
-+  echo "$as_me:12103: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12106: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11778: \$? = $ac_status" >&5
-+  echo "$as_me:12109: \$? = $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 11785 "configure"
-+#line 12116 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11801,16 +12132,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11804: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12135: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11807: \$? = $ac_status" >&5
-+  echo "$as_me:12138: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11810: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12141: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11813: \$? = $ac_status" >&5
-+  echo "$as_me:12144: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -11822,7 +12153,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11825: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:12156: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -11840,14 +12171,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:11843: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:12174: 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 11850 "configure"
-+#line 12181 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11865,23 +12196,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11868: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12199: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11871: \$? = $ac_status" >&5
-+  echo "$as_me:12202: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11874: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12205: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11877: \$? = $ac_status" >&5
-+  echo "$as_me:12208: \$? = $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 11884 "configure"
-+#line 12215 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11900,16 +12231,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11903: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12234: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11906: \$? = $ac_status" >&5
-+  echo "$as_me:12237: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11909: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12240: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11912: \$? = $ac_status" >&5
-+  echo "$as_me:12243: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -11921,7 +12252,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11924: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:12255: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -11944,14 +12275,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:11947: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:12278: 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 11954 "configure"
-+#line 12285 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -11969,23 +12300,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11972: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12303: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11975: \$? = $ac_status" >&5
-+  echo "$as_me:12306: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11978: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12309: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11981: \$? = $ac_status" >&5
-+  echo "$as_me:12312: \$? = $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 11988 "configure"
-+#line 12319 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -12004,16 +12335,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12007: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12338: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12010: \$? = $ac_status" >&5
-+  echo "$as_me:12341: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12013: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12344: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12016: \$? = $ac_status" >&5
-+  echo "$as_me:12347: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -12025,7 +12356,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12028: result: $cf_cv_wint_t" >&5
-+echo "$as_me:12359: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -12057,7 +12388,7 @@
- fi
- 
- ###   use option --disable-lp64 to allow long chtype
--echo "$as_me:12060: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:12391: 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.
-@@ -12067,7 +12398,7 @@
- else
-   with_lp64=$cf_dft_with_lp64
- fi;
--echo "$as_me:12070: result: $with_lp64" >&5
-+echo "$as_me:12401: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "x$with_lp64" = xyes ; then
-@@ -12083,7 +12414,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:12086: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:12417: 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
-@@ -12095,7 +12426,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 12098 "configure"
-+#line 12429 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -12115,16 +12446,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12118: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12449: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12121: \$? = $ac_status" >&5
-+  echo "$as_me:12452: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12124: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12455: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12127: \$? = $ac_status" >&5
-+  echo "$as_me:12458: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -12134,16 +12465,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12137: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12468: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12140: \$? = $ac_status" >&5
-+  echo "$as_me:12471: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12143: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12474: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12146: \$? = $ac_status" >&5
-+  echo "$as_me:12477: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -12157,13 +12488,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:12160: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:12491: 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:12166: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:12497: 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
-@@ -12171,7 +12502,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12174 "configure"
-+#line 12505 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -12191,16 +12522,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12194: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12525: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12197: \$? = $ac_status" >&5
-+  echo "$as_me:12528: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12200: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12531: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12203: \$? = $ac_status" >&5
-+  echo "$as_me:12534: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -12209,7 +12540,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12212 "configure"
-+#line 12543 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include 
-@@ -12230,16 +12561,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12233: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12564: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12236: \$? = $ac_status" >&5
-+  echo "$as_me:12567: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12239: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12570: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12242: \$? = $ac_status" >&5
-+  echo "$as_me:12573: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -12250,7 +12581,7 @@
-   break
- done
- fi
--echo "$as_me:12253: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:12584: 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
- 
-@@ -12260,7 +12591,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:12263: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:12594: 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
-@@ -12268,7 +12599,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12271 "configure"
-+#line 12602 "configure"
- #include "confdefs.h"
- #include 
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -12288,16 +12619,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12291: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12294: \$? = $ac_status" >&5
-+  echo "$as_me:12625: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12297: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12300: \$? = $ac_status" >&5
-+  echo "$as_me:12631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -12306,7 +12637,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12309 "configure"
-+#line 12640 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include 
-@@ -12327,16 +12658,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12330: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12661: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12333: \$? = $ac_status" >&5
-+  echo "$as_me:12664: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12336: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12667: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12339: \$? = $ac_status" >&5
-+  echo "$as_me:12670: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -12347,7 +12678,7 @@
-   break
- done
- fi
--echo "$as_me:12350: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:12681: 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
- 
-@@ -12360,7 +12691,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:12363: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:12694: 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
-@@ -12368,7 +12699,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12371 "configure"
-+#line 12702 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -12380,16 +12711,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12383: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12714: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12386: \$? = $ac_status" >&5
-+  echo "$as_me:12717: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12389: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12720: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12392: \$? = $ac_status" >&5
-+  echo "$as_me:12723: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -12398,7 +12729,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12401 "configure"
-+#line 12732 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include 
-@@ -12411,16 +12742,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12414: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12745: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12417: \$? = $ac_status" >&5
-+  echo "$as_me:12748: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12420: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12751: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12423: \$? = $ac_status" >&5
-+  echo "$as_me:12754: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -12431,7 +12762,7 @@
-   break
- done
- fi
--echo "$as_me:12434: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:12765: 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
- 
-@@ -12445,13 +12776,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:12448: checking for fseeko" >&5
-+echo "$as_me:12779: 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 12454 "configure"
-+#line 12785 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -12463,16 +12794,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12466: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12797: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12469: \$? = $ac_status" >&5
-+  echo "$as_me:12800: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12472: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12803: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12475: \$? = $ac_status" >&5
-+  echo "$as_me:12806: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -12482,7 +12813,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12485: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:12816: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -12521,14 +12852,14 @@
- 
- 	fi
- 
--	echo "$as_me:12524: checking whether to use struct dirent64" >&5
-+	echo "$as_me:12855: 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 12531 "configure"
-+#line 12862 "configure"
- #include "confdefs.h"
- 
- #pragma GCC diagnostic error "-Wincompatible-pointer-types"
-@@ -12550,16 +12881,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12884: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12556: \$? = $ac_status" >&5
-+  echo "$as_me:12887: \$? = $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:12890: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12562: \$? = $ac_status" >&5
-+  echo "$as_me:12893: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -12570,7 +12901,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:12573: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:12904: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -12580,7 +12911,7 @@
- 	fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:12583: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:12914: 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.
-@@ -12590,14 +12921,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:12593: result: $with_tparm_varargs" >&5
-+echo "$as_me:12924: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:12600: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:12931: 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.
-@@ -12607,14 +12938,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:12610: result: $with_tic_depends" >&5
-+echo "$as_me:12941: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
--echo "$as_me:12617: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
-+echo "$as_me:12948: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
- echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
- 
- # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
-@@ -12626,15 +12957,15 @@
- fi;
- if [ "x$with_wattr_macros" != xyes ]; then
- 	NCURSES_WATTR_MACROS=0
--	echo "$as_me:12629: result: yes" >&5
-+	echo "$as_me:12960: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
- 	NCURSES_WATTR_MACROS=1
--	echo "$as_me:12633: result: no" >&5
-+	echo "$as_me:12964: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:12637: checking for X11 rgb file" >&5
-+echo "$as_me:12968: checking for X11 rgb file" >&5
- echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
- 
- # Check whether --with-x11-rgb or --without-x11-rgb was given.
-@@ -12698,7 +13029,7 @@
- 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:12701: error: expected a pathname, not \"$cf_path\"" >&5
-+	{ { echo "$as_me:13032: error: expected a pathname, not \"$cf_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -12706,7 +13037,7 @@
- 
- fi
- 
--echo "$as_me:12709: result: $RGB_PATH" >&5
-+echo "$as_me:13040: result: $RGB_PATH" >&5
- echo "${ECHO_T}$RGB_PATH" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:13054: 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.
-@@ -12730,10 +13061,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:12733: result: $NCURSES_BOOL" >&5
-+echo "$as_me:13064: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:12736: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:13067: 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.
-@@ -12744,11 +13075,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:12747: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:13078: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:12751: checking for type of chtype" >&5
-+echo "$as_me:13082: 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.
-@@ -12758,11 +13089,11 @@
- else
-   NCURSES_CHTYPE=$cf_dft_chtype
- fi;
--echo "$as_me:12761: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:13092: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:12765: checking for type of ospeed" >&5
-+echo "$as_me:13096: 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.
-@@ -12772,11 +13103,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:12775: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:13106: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:12779: checking for type of mmask_t" >&5
-+echo "$as_me:13110: 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.
-@@ -12786,11 +13117,11 @@
- else
-   NCURSES_MMASK_T=$cf_dft_mmask_t
- fi;
--echo "$as_me:12789: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:13120: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ###   use option --with-ccharw-max to override CCHARW_MAX size
--echo "$as_me:12793: checking for size CCHARW_MAX" >&5
-+echo "$as_me:13124: checking for size CCHARW_MAX" >&5
- echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
- 
- # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -12800,16 +13131,16 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--echo "$as_me:12803: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:13134: result: $NCURSES_CCHARW_MAX" >&5
- echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
- 
--echo "$as_me:12806: checking for ANSI C header files" >&5
-+echo "$as_me:13137: 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 12812 "configure"
-+#line 13143 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -12817,13 +13148,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:12820: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13151: \"$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:12826: \$? = $ac_status" >&5
-+  echo "$as_me:13157: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12845,7 +13176,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 12848 "configure"
-+#line 13179 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -12863,7 +13194,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 12866 "configure"
-+#line 13197 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -12884,7 +13215,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12887 "configure"
-+#line 13218 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -12910,15 +13241,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12913: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13244: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12916: \$? = $ac_status" >&5
-+  echo "$as_me:13247: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12918: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13249: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12921: \$? = $ac_status" >&5
-+  echo "$as_me:13252: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12931,7 +13262,7 @@
- fi
- fi
- fi
--echo "$as_me:12934: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:13265: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -12947,28 +13278,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:12950: checking for $ac_header" >&5
-+echo "$as_me:13281: 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 12956 "configure"
-+#line 13287 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12962: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13293: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12965: \$? = $ac_status" >&5
-+  echo "$as_me:13296: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12968: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13299: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12971: \$? = $ac_status" >&5
-+  echo "$as_me:13302: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -12978,7 +13309,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12981: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13312: 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 <&5
-+echo "$as_me:13322: 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 12997 "configure"
-+#line 13328 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -13009,16 +13340,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13015: \$? = $ac_status" >&5
-+  echo "$as_me:13346: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13349: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13021: \$? = $ac_status" >&5
-+  echo "$as_me:13352: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -13028,10 +13359,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:13031: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:13362: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:13034: checking size of signed char" >&5
-+echo "$as_me:13365: 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
-@@ -13040,7 +13371,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 13043 "configure"
-+#line 13374 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -13052,21 +13383,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13055: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13386: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13058: \$? = $ac_status" >&5
-+  echo "$as_me:13389: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13392: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13064: \$? = $ac_status" >&5
-+  echo "$as_me:13395: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 13069 "configure"
-+#line 13400 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -13078,16 +13409,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13081: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13412: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13084: \$? = $ac_status" >&5
-+  echo "$as_me:13415: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13087: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13418: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13090: \$? = $ac_status" >&5
-+  echo "$as_me:13421: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -13103,7 +13434,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 13106 "configure"
-+#line 13437 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -13115,16 +13446,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13118: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13449: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13121: \$? = $ac_status" >&5
-+  echo "$as_me:13452: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13124: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13455: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13127: \$? = $ac_status" >&5
-+  echo "$as_me:13458: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -13140,7 +13471,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 13143 "configure"
-+#line 13474 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -13152,16 +13483,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13155: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13486: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13158: \$? = $ac_status" >&5
-+  echo "$as_me:13489: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13161: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13492: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13164: \$? = $ac_status" >&5
-+  echo "$as_me:13495: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -13174,12 +13505,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:13177: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:13508: 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 13182 "configure"
-+#line 13513 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -13195,15 +13526,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13198: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13529: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13201: \$? = $ac_status" >&5
-+  echo "$as_me:13532: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13534: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13206: \$? = $ac_status" >&5
-+  echo "$as_me:13537: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -13219,7 +13550,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:13222: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:13553: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <&5
-+echo "$as_me:13564: 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.
-@@ -13240,12 +13571,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:13243: result: $with_signed_char" >&5
-+echo "$as_me:13574: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
- 
- ###   use option --with-tparm-arg to override tparm's argument type
--echo "$as_me:13248: checking for type of tparm args" >&5
-+echo "$as_me:13579: checking for type of tparm args" >&5
- echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
- 
- # Check whether --with-tparm-arg or --without-tparm-arg was given.
-@@ -13255,11 +13586,11 @@
- else
-   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
- fi;
--echo "$as_me:13258: result: $NCURSES_TPARM_ARG" >&5
-+echo "$as_me:13589: result: $NCURSES_TPARM_ARG" >&5
- echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:13262: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:13593: 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.
-@@ -13269,7 +13600,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:13272: result: $with_rcs_ids" >&5
-+echo "$as_me:13603: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "x$with_rcs_ids" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -13278,7 +13609,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:13281: checking format of man-pages" >&5
-+echo "$as_me:13612: 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.
-@@ -13367,14 +13698,14 @@
- 	;;
- esac
- 
--echo "$as_me:13370: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:13701: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--	{ echo "$as_me:13373: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+	{ echo "$as_me:13704: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:13377: checking for manpage renaming" >&5
-+echo "$as_me:13708: 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.
-@@ -13402,7 +13733,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:13405: error: not a filename: $MANPAGE_RENAMES" >&5
-+		{ { echo "$as_me:13736: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -13416,10 +13747,10 @@
- 	fi
- fi
- 
--echo "$as_me:13419: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:13750: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:13422: checking if manpage aliases will be installed" >&5
-+echo "$as_me:13753: 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.
-@@ -13430,7 +13761,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:13433: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:13764: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- case "x$LN_S" in
-@@ -13444,7 +13775,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:13447: checking if manpage symlinks should be used" >&5
-+echo "$as_me:13778: 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.
-@@ -13457,17 +13788,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:13460: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:13791: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:13466: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:13797: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:13470: checking for manpage tbl" >&5
-+echo "$as_me:13801: 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.
-@@ -13478,7 +13809,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:13481: result: $MANPAGE_TBL" >&5
-+echo "$as_me:13812: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
- if test "$prefix" = "NONE" ; then
-@@ -13811,7 +14142,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:13814: checking if you want to build with function extensions" >&5
-+echo "$as_me:14145: 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.
-@@ -13821,7 +14152,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:13824: result: $with_ext_funcs" >&5
-+echo "$as_me:14155: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "x$with_ext_funcs" = xyes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -13881,7 +14212,7 @@
- 	GENERATED_EXT_FUNCS=
- fi
- 
--echo "$as_me:13884: checking if you want to build with SCREEN extensions" >&5
-+echo "$as_me:14215: checking if you want to build with SCREEN extensions" >&5
- echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
- 
- # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -13891,7 +14222,7 @@
- else
-   with_sp_funcs=$cf_dft_ext_spfuncs
- fi;
--echo "$as_me:13894: result: $with_sp_funcs" >&5
-+echo "$as_me:14225: result: $with_sp_funcs" >&5
- echo "${ECHO_T}$with_sp_funcs" >&6
- if test "x$with_sp_funcs" = xyes ; then
- 	NCURSES_SP_FUNCS=1
-@@ -13910,7 +14241,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--echo "$as_me:13913: checking if you want to build with terminal-driver" >&5
-+echo "$as_me:14244: checking if you want to build with terminal-driver" >&5
- echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
- 
- # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -13920,7 +14251,7 @@
- else
-   with_term_driver=no
- fi;
--echo "$as_me:13923: result: $with_term_driver" >&5
-+echo "$as_me:14254: result: $with_term_driver" >&5
- echo "${ECHO_T}$with_term_driver" >&6
- if test "x$with_term_driver" = xyes ; then
- 
-@@ -13929,19 +14260,19 @@
- EOF
- 
- 	if test "x$with_termlib" != xno ; then
--		{ { echo "$as_me:13932: error: The term-driver option conflicts with the termlib option" >&5
-+		{ { echo "$as_me:14263: error: The term-driver option conflicts with the termlib option" >&5
- echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	if test "x$with_sp_funcs" != xyes ; then
--		{ { echo "$as_me:13937: error: The term-driver option relies upon sp-funcs" >&5
-+		{ { echo "$as_me:14268: error: The term-driver option relies upon sp-funcs" >&5
- echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:13944: checking for extended use of const keyword" >&5
-+echo "$as_me:14275: 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.
-@@ -13951,7 +14282,7 @@
- else
-   with_ext_const=$cf_dft_ext_const
- fi;
--echo "$as_me:13954: result: $with_ext_const" >&5
-+echo "$as_me:14285: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "x$with_ext_const" = xyes ; then
-@@ -13959,7 +14290,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:13962: checking if you want to use extended colors" >&5
-+echo "$as_me:14293: 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.
-@@ -13969,12 +14300,12 @@
- else
-   with_ext_colors=$cf_dft_ext_colors
- fi;
--echo "$as_me:13972: result: $with_ext_colors" >&5
-+echo "$as_me:14303: result: $with_ext_colors" >&5
- echo "${ECHO_T}$with_ext_colors" >&6
- NCURSES_EXT_COLORS=0
- if test "x$with_ext_colors" = xyes ; then
- 	if test "x$with_widec" != xyes ; then
--		{ echo "$as_me:13977: WARNING: This option applies only to wide-character library" >&5
-+		{ echo "$as_me:14308: WARNING: This option applies only to wide-character library" >&5
- echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
- 	else
- 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-@@ -13984,7 +14315,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:13987: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:14318: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -14012,7 +14343,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:14015: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:14346: 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.
-@@ -14022,7 +14353,7 @@
- else
-   with_ext_mouse=$cf_dft_ext_mouse
- fi;
--echo "$as_me:14025: result: $with_ext_mouse" >&5
-+echo "$as_me:14356: result: $with_ext_mouse" >&5
- echo "${ECHO_T}$with_ext_mouse" >&6
- NCURSES_MOUSE_VERSION=1
- if test "x$with_ext_mouse" = xyes ; then
-@@ -14033,7 +14364,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:14036: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:14367: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -14042,7 +14373,7 @@
- fi
- 
- ###   use option --enable-ext-putwin to turn on extended screendumps
--echo "$as_me:14045: checking if you want to use extended putwin/screendump" >&5
-+echo "$as_me:14376: checking if you want to use extended putwin/screendump" >&5
- echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
- 
- # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
-@@ -14052,7 +14383,7 @@
- else
-   with_ext_putwin=$cf_dft_ext_putwin
- fi;
--echo "$as_me:14055: result: $with_ext_putwin" >&5
-+echo "$as_me:14386: result: $with_ext_putwin" >&5
- echo "${ECHO_T}$with_ext_putwin" >&6
- if test "x$with_ext_putwin" = xyes ; then
- 
-@@ -14062,7 +14393,7 @@
- 
- fi
- 
--echo "$as_me:14065: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:14396: 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.
-@@ -14072,7 +14403,7 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:14075: result: $with_no_padding" >&5
-+echo "$as_me:14406: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "x$with_no_padding" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -14080,7 +14411,7 @@
- EOF
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:14083: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:14414: 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.
-@@ -14090,7 +14421,7 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:14093: result: $with_sigwinch" >&5
-+echo "$as_me:14424: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "x$with_sigwinch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -14098,7 +14429,7 @@
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:14101: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:14432: 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.
-@@ -14108,14 +14439,14 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:14111: result: $with_tcap_names" >&5
-+echo "$as_me:14442: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
- 
- ##############################################################################
- 
--echo "$as_me:14118: checking if you want to link with the pthread library" >&5
-+echo "$as_me:14449: 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.
-@@ -14125,27 +14456,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:14128: result: $with_pthread" >&5
-+echo "$as_me:14459: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:14132: checking for pthread.h" >&5
-+	echo "$as_me:14463: 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 14138 "configure"
-+#line 14469 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:14142: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14473: \"$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:14148: \$? = $ac_status" >&5
-+  echo "$as_me:14479: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14164,7 +14495,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:14167: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:14498: 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
- 
-@@ -14174,7 +14505,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:14177: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:14508: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -14195,7 +14526,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 14198 "configure"
-+#line 14529 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -14212,16 +14543,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14215: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14546: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14218: \$? = $ac_status" >&5
-+  echo "$as_me:14549: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14221: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14552: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14224: \$? = $ac_status" >&5
-+  echo "$as_me:14555: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -14231,7 +14562,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:14234: result: $with_pthread" >&5
-+	    echo "$as_me:14565: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -14259,7 +14590,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:14262: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:14593: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -14269,13 +14600,13 @@
- fi
- 
- if test "x$with_pthread" != xno; then
--	echo "$as_me:14272: checking for pthread_kill" >&5
-+	echo "$as_me:14603: checking for pthread_kill" >&5
- echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
- if test "${ac_cv_func_pthread_kill+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14278 "configure"
-+#line 14609 "configure"
- #include "confdefs.h"
- #define pthread_kill autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -14306,16 +14637,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14309: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14640: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14312: \$? = $ac_status" >&5
-+  echo "$as_me:14643: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14315: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14646: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14318: \$? = $ac_status" >&5
-+  echo "$as_me:14649: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_pthread_kill=yes
- else
-@@ -14325,11 +14656,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14328: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:14659: result: $ac_cv_func_pthread_kill" >&5
- echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
- if test $ac_cv_func_pthread_kill = yes; then
- 
--		echo "$as_me:14332: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+		echo "$as_me:14663: checking if you want to allow EINTR in wgetch with pthreads" >&5
- echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -14339,7 +14670,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		echo "$as_me:14342: result: $use_pthreads_eintr" >&5
-+		echo "$as_me:14673: result: $use_pthreads_eintr" >&5
- echo "${ECHO_T}$use_pthreads_eintr" >&6
- 		if test "x$use_pthreads_eintr" = xyes ; then
- 
-@@ -14350,7 +14681,7 @@
- 		fi
- fi
- 
--	echo "$as_me:14353: checking if you want to use weak-symbols for pthreads" >&5
-+	echo "$as_me:14684: 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.
-@@ -14360,18 +14691,18 @@
- else
-   use_weak_symbols=no
- fi;
--	echo "$as_me:14363: result: $use_weak_symbols" >&5
-+	echo "$as_me:14694: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- 	if test "x$use_weak_symbols" = xyes ; then
- 
--echo "$as_me:14367: checking if $CC supports weak symbols" >&5
-+echo "$as_me:14698: 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 14374 "configure"
-+#line 14705 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -14397,16 +14728,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14400: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14731: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14403: \$? = $ac_status" >&5
-+  echo "$as_me:14734: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14737: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14409: \$? = $ac_status" >&5
-+  echo "$as_me:14740: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -14417,7 +14748,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:14420: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:14751: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- 	else
-@@ -14467,7 +14798,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:14470: checking if you want reentrant code" >&5
-+echo "$as_me:14801: checking if you want reentrant code" >&5
- echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -14477,7 +14808,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:14480: result: $with_reentrant" >&5
-+echo "$as_me:14811: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "x$with_reentrant" = xyes ; then
- 	cf_cv_enable_reentrant=1
-@@ -14565,7 +14896,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:14568: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:14899: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -14577,7 +14908,7 @@
- 	NCURSES_SIZE_T=short
- fi
- 
--echo "$as_me:14580: checking if you want opaque curses-library structures" >&5
-+echo "$as_me:14911: checking if you want opaque curses-library structures" >&5
- echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
- 
- # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
-@@ -14599,16 +14930,16 @@
- 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
- 
- fi;
--echo "$as_me:14602: result: $enable_opaque_curses" >&5
-+echo "$as_me:14933: result: $enable_opaque_curses" >&5
- echo "${ECHO_T}$enable_opaque_curses" >&6
- 
- test "$cf_cv_enable_reentrant" = 1 && \
- test "$enable_opaque_curses" = no && \
--{ { echo "$as_me:14607: error: reentrant configuration requires opaque library" >&5
-+{ { echo "$as_me:14938: error: reentrant configuration requires opaque library" >&5
- echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:14611: checking if you want opaque form-library structures" >&5
-+echo "$as_me:14942: checking if you want opaque form-library structures" >&5
- echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
- 
- # Check whether --enable-opaque-form or --disable-opaque-form was given.
-@@ -14618,10 +14949,10 @@
- else
-   enable_opaque_form=no
- fi;
--echo "$as_me:14621: result: $enable_opaque_form" >&5
-+echo "$as_me:14952: result: $enable_opaque_form" >&5
- echo "${ECHO_T}$enable_opaque_form" >&6
- 
--echo "$as_me:14624: checking if you want opaque menu-library structures" >&5
-+echo "$as_me:14955: checking if you want opaque menu-library structures" >&5
- echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
- 
- # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
-@@ -14631,10 +14962,10 @@
- else
-   enable_opaque_menu=no
- fi;
--echo "$as_me:14634: result: $enable_opaque_menu" >&5
-+echo "$as_me:14965: result: $enable_opaque_menu" >&5
- echo "${ECHO_T}$enable_opaque_menu" >&6
- 
--echo "$as_me:14637: checking if you want opaque panel-library structures" >&5
-+echo "$as_me:14968: checking if you want opaque panel-library structures" >&5
- echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
- 
- # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
-@@ -14644,7 +14975,7 @@
- else
-   enable_opaque_panel=no
- fi;
--echo "$as_me:14647: result: $enable_opaque_panel" >&5
-+echo "$as_me:14978: result: $enable_opaque_panel" >&5
- echo "${ECHO_T}$enable_opaque_panel" >&6
- 
- NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
-@@ -14654,7 +14985,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:14657: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:14988: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -14664,7 +14995,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:14667: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:14998: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -14677,7 +15008,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:14680: checking if you want all development code" >&5
-+echo "$as_me:15011: 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.
-@@ -14687,11 +15018,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:14690: result: $with_develop" >&5
-+echo "$as_me:15021: 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:14694: checking if you want hard-tabs code" >&5
-+echo "$as_me:15025: 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.
-@@ -14701,7 +15032,7 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:14704: result: $enable_hard_tabs" >&5
-+echo "$as_me:15035: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "x$enable_hard_tabs" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -14709,7 +15040,7 @@
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:14712: checking if you want limited support for xmc" >&5
-+echo "$as_me:15043: 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.
-@@ -14719,7 +15050,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:14722: result: $enable_xmc_glitch" >&5
-+echo "$as_me:15053: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "x$enable_xmc_glitch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -14729,7 +15060,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:14732: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:15063: 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.
-@@ -14739,7 +15070,7 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:14742: result: $with_assumed_color" >&5
-+echo "$as_me:15073: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "x$with_assumed_color" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -14747,7 +15078,7 @@
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:14750: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:15081: 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.
-@@ -14757,7 +15088,7 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:14760: result: $with_hashmap" >&5
-+echo "$as_me:15091: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "x$with_hashmap" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -14765,7 +15096,7 @@
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:14768: checking if you want colorfgbg code" >&5
-+echo "$as_me:15099: 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.
-@@ -14775,7 +15106,7 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:14778: result: $with_colorfgbg" >&5
-+echo "$as_me:15109: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "x$with_colorfgbg" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -14783,7 +15114,7 @@
- EOF
- 
- ###   use option --enable-interop to turn on use of bindings used for interop
--echo "$as_me:14786: checking if you want interop bindings" >&5
-+echo "$as_me:15117: checking if you want interop bindings" >&5
- echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
- 
- # Check whether --enable-interop or --disable-interop was given.
-@@ -14793,13 +15124,13 @@
- else
-   with_exp_interop=$cf_dft_interop
- fi;
--echo "$as_me:14796: result: $with_exp_interop" >&5
-+echo "$as_me:15127: result: $with_exp_interop" >&5
- echo "${ECHO_T}$with_exp_interop" >&6
- 
- NCURSES_INTEROP_FUNCS=0
- test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
- 
--echo "$as_me:14802: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:15133: 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.
-@@ -14809,13 +15140,13 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:14812: result: $with_safe_sprintf" >&5
-+echo "$as_me:15143: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- 
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:14818: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:15149: 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.
-@@ -14825,7 +15156,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:14828: result: $with_scroll_hints" >&5
-+echo "$as_me:15159: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "x$with_scroll_hints" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -14834,7 +15165,7 @@
- 
- fi
- 
--echo "$as_me:14837: checking if you want wgetch-events code" >&5
-+echo "$as_me:15168: checking if you want wgetch-events code" >&5
- echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -14844,7 +15175,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:14847: result: $with_wgetch_events" >&5
-+echo "$as_me:15178: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "x$with_wgetch_events" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -14855,7 +15186,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:14858: checking if you want to see long compiling messages" >&5
-+echo "$as_me:15189: checking if you want to see long compiling messages" >&5
- echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -14889,7 +15220,7 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:14892: result: $enableval" >&5
-+echo "$as_me:15223: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- if test "x$enable_echo" = xyes; then
-@@ -14902,7 +15233,7 @@
- 
- # --disable-stripping is used for debugging
- 
--echo "$as_me:14905: checking if you want to install stripped executables" >&5
-+echo "$as_me:15236: checking if you want to install stripped executables" >&5
- echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
- 
- # Check whether --enable-stripping or --disable-stripping was given.
-@@ -14919,7 +15250,7 @@
- 	with_stripping=yes
- 
- fi;
--echo "$as_me:14922: result: $with_stripping" >&5
-+echo "$as_me:15253: result: $with_stripping" >&5
- echo "${ECHO_T}$with_stripping" >&6
- 
- if test "$with_stripping" = yes
-@@ -14930,7 +15261,7 @@
- fi
- 
- : ${INSTALL:=install}
--echo "$as_me:14933: checking if install accepts -p option" >&5
-+echo "$as_me:15264: checking if install accepts -p option" >&5
- echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
- if test "${cf_cv_install_p+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14961,10 +15292,10 @@
- 	rm -rf conftest*
- 
- fi
--echo "$as_me:14964: result: $cf_cv_install_p" >&5
-+echo "$as_me:15295: result: $cf_cv_install_p" >&5
- echo "${ECHO_T}$cf_cv_install_p" >&6
- 
--echo "$as_me:14967: checking if install needs to be told about ownership" >&5
-+echo "$as_me:15298: checking if install needs to be told about ownership" >&5
- echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
- case `$ac_config_guess` in
- (*minix)
-@@ -14975,7 +15306,7 @@
- 	;;
- esac
- 
--echo "$as_me:14978: result: $with_install_o" >&5
-+echo "$as_me:15309: result: $with_install_o" >&5
- echo "${ECHO_T}$with_install_o" >&6
- if test "x$with_install_o" = xyes
- then
-@@ -14999,7 +15330,7 @@
- fi
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:15002: checking if you want to see compiler warnings" >&5
-+echo "$as_me:15333: 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.
-@@ -15007,7 +15338,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:15010: result: $with_warnings" >&5
-+echo "$as_me:15341: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -15019,12 +15350,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:15022: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:15353: 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 15027 "configure"
-+#line 15358 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15041,16 +15372,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15044: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15375: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15047: \$? = $ac_status" >&5
-+  echo "$as_me:15378: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15050: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15381: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15053: \$? = $ac_status" >&5
-+  echo "$as_me:15384: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -15061,7 +15392,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:15064: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:15395: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -15070,12 +15401,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:15073: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:15404: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15078 "configure"
-+#line 15409 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15092,16 +15423,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15095: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15426: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15098: \$? = $ac_status" >&5
-+  echo "$as_me:15429: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15101: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15432: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15104: \$? = $ac_status" >&5
-+  echo "$as_me:15435: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -15112,13 +15443,13 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:15115: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:15446: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- if test "x$have_x" = xyes; then
- cat >conftest.$ac_ext <<_ACEOF
--#line 15121 "configure"
-+#line 15452 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15133,26 +15464,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15467: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15139: \$? = $ac_status" >&5
-+  echo "$as_me:15470: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15473: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15145: \$? = $ac_status" >&5
-+  echo "$as_me:15476: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--echo "$as_me:15148: checking for X11/Xt const-feature" >&5
-+echo "$as_me:15479: checking for X11/Xt const-feature" >&5
- echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
- if test "${cf_cv_const_x_string+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15155 "configure"
-+#line 15486 "configure"
- #include "confdefs.h"
- 
- #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
-@@ -15169,16 +15500,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15172: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15503: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15175: \$? = $ac_status" >&5
-+  echo "$as_me:15506: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15509: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15181: \$? = $ac_status" >&5
-+  echo "$as_me:15512: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_const_x_string=no
-@@ -15193,7 +15524,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:15196: result: $cf_cv_const_x_string" >&5
-+echo "$as_me:15527: result: $cf_cv_const_x_string" >&5
- echo "${ECHO_T}$cf_cv_const_x_string" >&6
- 
- case $cf_cv_const_x_string in
-@@ -15218,7 +15549,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
-  fi
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:15568: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -15250,12 +15581,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:15253: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:15584: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15256: \$? = $ac_status" >&5
-+  echo "$as_me:15587: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:15258: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:15589: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -15263,7 +15594,7 @@
- 	CFLAGS="$cf_save_CFLAGS"
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:15266: checking for $CC warning options..." >&5
-+	{ echo "$as_me:15597: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -15287,12 +15618,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:15290: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:15621: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15293: \$? = $ac_status" >&5
-+  echo "$as_me:15624: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:15295: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:15626: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Winline)
-@@ -15300,7 +15631,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:15303: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:15634: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -15310,7 +15641,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:15313: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:15644: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -15330,12 +15661,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:15333: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:15664: 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 15338 "configure"
-+#line 15669 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15352,16 +15683,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15355: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15686: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15358: \$? = $ac_status" >&5
-+  echo "$as_me:15689: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15361: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15692: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15364: \$? = $ac_status" >&5
-+  echo "$as_me:15695: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -15372,7 +15703,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:15375: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:15706: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -15381,12 +15712,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:15384: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:15715: checking if this is really Clang C++ compiler" >&5
- echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CXXFLAGS"
- 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15389 "configure"
-+#line 15720 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15403,16 +15734,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15406: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15737: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15409: \$? = $ac_status" >&5
-+  echo "$as_me:15740: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15412: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15743: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15415: \$? = $ac_status" >&5
-+  echo "$as_me:15746: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -15423,7 +15754,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:15426: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:15757: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -15435,7 +15766,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:15787: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -15470,12 +15801,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:15473: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:15804: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15476: \$? = $ac_status" >&5
-+  echo "$as_me:15807: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:15478: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:15809: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -15484,7 +15815,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:15487: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:15818: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -15514,16 +15845,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:15517: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:15848: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15520: \$? = $ac_status" >&5
-+  echo "$as_me:15851: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:15522: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:15853: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:15526: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:15857: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -15559,10 +15890,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:15562: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:15893: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:15945: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15617: \$? = $ac_status" >&5
-+  echo "$as_me:15948: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:15619: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:15950: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -15675,7 +16006,7 @@
- rm -rf conftest*
- fi
- 
--echo "$as_me:15678: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:16009: checking if you want to work around bogus compiler/loader warnings" >&5
- echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
- 
- # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -15685,7 +16016,7 @@
- else
-   with_string_hacks=no
- fi;
--echo "$as_me:15688: result: $with_string_hacks" >&5
-+echo "$as_me:16019: result: $with_string_hacks" >&5
- echo "${ECHO_T}$with_string_hacks" >&6
- 
- if test "x$with_string_hacks" = "xyes"; then
-@@ -15694,15 +16025,15 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ echo "$as_me:15697: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:16028: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
- echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
--	echo "$as_me:15699: checking for strlcat" >&5
-+	echo "$as_me:16030: checking for strlcat" >&5
- echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
- if test "${ac_cv_func_strlcat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15705 "configure"
-+#line 16036 "configure"
- #include "confdefs.h"
- #define strlcat autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -15733,16 +16064,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15736: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16067: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15739: \$? = $ac_status" >&5
-+  echo "$as_me:16070: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15742: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16073: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15745: \$? = $ac_status" >&5
-+  echo "$as_me:16076: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_strlcat=yes
- else
-@@ -15752,7 +16083,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15755: result: $ac_cv_func_strlcat" >&5
-+echo "$as_me:16086: result: $ac_cv_func_strlcat" >&5
- echo "${ECHO_T}$ac_cv_func_strlcat" >&6
- if test $ac_cv_func_strlcat = yes; then
- 
-@@ -15762,7 +16093,7 @@
- 
- else
- 
--		echo "$as_me:15765: checking for strlcat in -lbsd" >&5
-+		echo "$as_me:16096: checking for strlcat in -lbsd" >&5
- echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15770,7 +16101,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15773 "configure"
-+#line 16104 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15789,16 +16120,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15792: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16123: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15795: \$? = $ac_status" >&5
-+  echo "$as_me:16126: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15798: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15801: \$? = $ac_status" >&5
-+  echo "$as_me:16132: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_strlcat=yes
- else
-@@ -15809,7 +16140,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15812: result: $ac_cv_lib_bsd_strlcat" >&5
-+echo "$as_me:16143: result: $ac_cv_lib_bsd_strlcat" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
- if test $ac_cv_lib_bsd_strlcat = yes; then
- 
-@@ -15832,23 +16163,23 @@
- for ac_header in bsd/string.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15835: checking for $ac_header" >&5
-+echo "$as_me:16166: 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 15841 "configure"
-+#line 16172 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15845: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16176: \"$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:15851: \$? = $ac_status" >&5
-+  echo "$as_me:16182: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15867,7 +16198,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15870: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16201: 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 <&5
-+echo "$as_me:16222: 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 15897 "configure"
-+#line 16228 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -15925,16 +16256,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15928: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16259: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15931: \$? = $ac_status" >&5
-+  echo "$as_me:16262: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15934: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16265: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15937: \$? = $ac_status" >&5
-+  echo "$as_me:16268: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -15944,7 +16275,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15947: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:16278: 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 <&5
-+echo "$as_me:16291: 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.
-@@ -15967,7 +16298,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:15970: result: $with_assertions" >&5
-+echo "$as_me:16301: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -15983,7 +16314,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:15986: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:16317: 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.
-@@ -16000,7 +16331,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:16003: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:16334: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -16114,23 +16445,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:16117: checking for dmalloc.h" >&5
-+	echo "$as_me:16448: 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 16123 "configure"
-+#line 16454 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:16127: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16458: \"$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:16133: \$? = $ac_status" >&5
-+  echo "$as_me:16464: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16149,11 +16480,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16152: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:16483: 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:16156: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:16487: 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
-@@ -16161,7 +16492,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16164 "configure"
-+#line 16495 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16180,16 +16511,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16183: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16514: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16186: \$? = $ac_status" >&5
-+  echo "$as_me:16517: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16189: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16520: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16192: \$? = $ac_status" >&5
-+  echo "$as_me:16523: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -16200,7 +16531,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16203: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:16534: 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 <&5
-+echo "$as_me:16549: 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.
-@@ -16232,7 +16563,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:16235: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:16566: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -16346,23 +16677,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:16349: checking for dbmalloc.h" >&5
-+	echo "$as_me:16680: 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 16355 "configure"
-+#line 16686 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:16359: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16690: \"$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:16365: \$? = $ac_status" >&5
-+  echo "$as_me:16696: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16381,11 +16712,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16384: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:16715: 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:16388: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:16719: 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
-@@ -16393,7 +16724,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16396 "configure"
-+#line 16727 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16412,16 +16743,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16415: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16746: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16418: \$? = $ac_status" >&5
-+  echo "$as_me:16749: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16752: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16424: \$? = $ac_status" >&5
-+  echo "$as_me:16755: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -16432,7 +16763,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16435: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:16766: 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 <&5
-+echo "$as_me:16781: 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.
-@@ -16464,7 +16795,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:16467: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:16798: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -16577,7 +16908,7 @@
- 	;;
- esac
- 
--echo "$as_me:16580: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:16911: 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.
-@@ -16587,7 +16918,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:16590: result: $with_no_leaks" >&5
-+echo "$as_me:16921: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -16639,7 +16970,7 @@
- 	;;
- esac
- 
--echo "$as_me:16642: checking whether to add trace feature to all models" >&5
-+echo "$as_me:16973: 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.
-@@ -16649,7 +16980,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:16652: result: $cf_with_trace" >&5
-+echo "$as_me:16983: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "x$cf_with_trace" = xyes ; then
-@@ -16763,7 +17094,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:16766: checking if we want to use GNAT projects" >&5
-+echo "$as_me:17097: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -16780,7 +17111,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:16783: result: $enable_gnat_projects" >&5
-+echo "$as_me:17114: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -16790,13 +17121,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--echo "$as_me:16793: checking for gettimeofday" >&5
-+echo "$as_me:17124: 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 16799 "configure"
-+#line 17130 "configure"
- #include "confdefs.h"
- #define gettimeofday autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -16827,16 +17158,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16830: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17161: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16833: \$? = $ac_status" >&5
-+  echo "$as_me:17164: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16836: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17167: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16839: \$? = $ac_status" >&5
-+  echo "$as_me:17170: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -16846,7 +17177,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16849: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:17180: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
- 
-@@ -16856,7 +17187,7 @@
- 
- else
- 
--echo "$as_me:16859: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:17190: 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
-@@ -16864,7 +17195,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16867 "configure"
-+#line 17198 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16883,16 +17214,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17217: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16889: \$? = $ac_status" >&5
-+  echo "$as_me:17220: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16892: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17223: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16895: \$? = $ac_status" >&5
-+  echo "$as_me:17226: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -16903,7 +17234,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16906: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:17237: 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
- 
-@@ -16933,14 +17264,14 @@
- 	;;
- esac
- 
--echo "$as_me:16936: checking if -lm needed for math functions" >&5
-+echo "$as_me:17267: 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 16943 "configure"
-+#line 17274 "configure"
- #include "confdefs.h"
- 
- 	#include 
-@@ -16956,16 +17287,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16959: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17290: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16962: \$? = $ac_status" >&5
-+  echo "$as_me:17293: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16965: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17296: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16968: \$? = $ac_status" >&5
-+  echo "$as_me:17299: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -16975,7 +17306,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16978: result: $cf_cv_need_libm" >&5
-+echo "$as_me:17309: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -16983,13 +17314,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:16986: checking for ANSI C header files" >&5
-+echo "$as_me:17317: 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 16992 "configure"
-+#line 17323 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -16997,13 +17328,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:17000: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17331: \"$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:17006: \$? = $ac_status" >&5
-+  echo "$as_me:17337: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -17025,7 +17356,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 17028 "configure"
-+#line 17359 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -17043,7 +17374,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 17046 "configure"
-+#line 17377 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -17064,7 +17395,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17067 "configure"
-+#line 17398 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -17090,15 +17421,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17093: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17424: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17096: \$? = $ac_status" >&5
-+  echo "$as_me:17427: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17429: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17101: \$? = $ac_status" >&5
-+  echo "$as_me:17432: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -17111,7 +17442,7 @@
- fi
- fi
- fi
--echo "$as_me:17114: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:17445: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -17124,13 +17455,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:17127: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:17458: 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 17133 "configure"
-+#line 17464 "configure"
- #include "confdefs.h"
- #include 
- #include <$ac_hdr>
-@@ -17145,16 +17476,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17148: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17151: \$? = $ac_status" >&5
-+  echo "$as_me:17482: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17485: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17157: \$? = $ac_status" >&5
-+  echo "$as_me:17488: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -17164,7 +17495,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17167: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:17498: 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 <&5
-+  echo "$as_me:17511: 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
-@@ -17185,7 +17516,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17188 "configure"
-+#line 17519 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17204,16 +17535,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17207: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17538: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17210: \$? = $ac_status" >&5
-+  echo "$as_me:17541: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17213: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17544: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17216: \$? = $ac_status" >&5
-+  echo "$as_me:17547: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -17224,14 +17555,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17227: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:17558: 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:17234: checking for opendir in -lx" >&5
-+  echo "$as_me:17565: 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
-@@ -17239,7 +17570,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17242 "configure"
-+#line 17573 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17258,16 +17589,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17261: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17592: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17264: \$? = $ac_status" >&5
-+  echo "$as_me:17595: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17598: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17270: \$? = $ac_status" >&5
-+  echo "$as_me:17601: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -17278,7 +17609,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17281: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:17612: 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"
-@@ -17286,13 +17617,13 @@
- 
- fi
- 
--echo "$as_me:17289: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:17620: 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 17295 "configure"
-+#line 17626 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -17308,16 +17639,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17311: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17642: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17314: \$? = $ac_status" >&5
-+  echo "$as_me:17645: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17317: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17648: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17320: \$? = $ac_status" >&5
-+  echo "$as_me:17651: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -17327,7 +17658,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17330: result: $ac_cv_header_time" >&5
-+echo "$as_me:17661: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -17346,13 +17677,13 @@
- 	;;
- esac
- 
--echo "$as_me:17349: checking for regcomp" >&5
-+echo "$as_me:17680: checking for regcomp" >&5
- echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
- if test "${ac_cv_func_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17355 "configure"
-+#line 17686 "configure"
- #include "confdefs.h"
- #define regcomp autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -17383,16 +17714,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17386: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17717: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17389: \$? = $ac_status" >&5
-+  echo "$as_me:17720: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17392: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17723: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17395: \$? = $ac_status" >&5
-+  echo "$as_me:17726: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -17402,7 +17733,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17405: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:17736: result: $ac_cv_func_regcomp" >&5
- echo "${ECHO_T}$ac_cv_func_regcomp" >&6
- if test $ac_cv_func_regcomp = yes; then
-   cf_regex_func=regcomp
-@@ -17411,7 +17742,7 @@
- 	for cf_regex_lib in $cf_regex_libs
- 	do
- 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:17414: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:17745: checking for regcomp in -l$cf_regex_lib" >&5
- echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17419,7 +17750,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17422 "configure"
-+#line 17753 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17438,16 +17769,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17441: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17772: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17444: \$? = $ac_status" >&5
-+  echo "$as_me:17775: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17778: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17450: \$? = $ac_status" >&5
-+  echo "$as_me:17781: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -17458,7 +17789,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17461: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:17792: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -17487,13 +17818,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:17490: checking for compile" >&5
-+	echo "$as_me:17821: checking for compile" >&5
- echo $ECHO_N "checking for compile... $ECHO_C" >&6
- if test "${ac_cv_func_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17496 "configure"
-+#line 17827 "configure"
- #include "confdefs.h"
- #define compile autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -17524,16 +17855,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17527: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17858: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17530: \$? = $ac_status" >&5
-+  echo "$as_me:17861: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17533: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17864: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17536: \$? = $ac_status" >&5
-+  echo "$as_me:17867: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -17543,13 +17874,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17546: result: $ac_cv_func_compile" >&5
-+echo "$as_me:17877: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:17552: checking for compile in -lgen" >&5
-+		echo "$as_me:17883: checking for compile in -lgen" >&5
- echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17557,7 +17888,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17560 "configure"
-+#line 17891 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17576,16 +17907,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17579: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17910: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17582: \$? = $ac_status" >&5
-+  echo "$as_me:17913: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17585: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17916: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17588: \$? = $ac_status" >&5
-+  echo "$as_me:17919: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -17596,7 +17927,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17599: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:17930: result: $ac_cv_lib_gen_compile" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
-@@ -17624,11 +17955,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:17627: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:17958: WARNING: cannot find regular expression library" >&5
- echo "$as_me: WARNING: cannot find regular expression library" >&2;}
- fi
- 
--echo "$as_me:17631: checking for regular-expression headers" >&5
-+echo "$as_me:17962: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex_hdrs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17640,7 +17971,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 17643 "configure"
-+#line 17974 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -17655,16 +17986,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17658: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17989: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17661: \$? = $ac_status" >&5
-+  echo "$as_me:17992: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17995: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17667: \$? = $ac_status" >&5
-+  echo "$as_me:17998: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -17681,7 +18012,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 17684 "configure"
-+#line 18015 "configure"
- #include "confdefs.h"
- #include 
- #include <$cf_regex_hdr>
-@@ -17699,16 +18030,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17702: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18033: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17705: \$? = $ac_status" >&5
-+  echo "$as_me:18036: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17708: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18039: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17711: \$? = $ac_status" >&5
-+  echo "$as_me:18042: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -17724,11 +18055,11 @@
- esac
- 
- fi
--echo "$as_me:17727: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:18058: result: $cf_cv_regex_hdrs" >&5
- echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
- 
- case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:17731: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:18062: WARNING: no regular expression header found" >&5
- echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
- 	(regex.h)
- cat >>confdefs.h <<\EOF
-@@ -17767,23 +18098,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:17770: checking for $ac_header" >&5
-+echo "$as_me:18101: 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 17776 "configure"
-+#line 18107 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:17780: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18111: \"$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:17786: \$? = $ac_status" >&5
-+  echo "$as_me:18117: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -17802,7 +18133,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:17805: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18136: 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 <&5
-+echo "$as_me:18149: 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 17824 "configure"
-+#line 18155 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:17828: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18159: \"$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:17834: \$? = $ac_status" >&5
-+  echo "$as_me:18165: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -17850,7 +18181,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:17853: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18184: 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 <&5
-+echo "$as_me:18194: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17870,7 +18201,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 17873 "configure"
-+#line 18204 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -17883,16 +18214,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17886: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18217: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17889: \$? = $ac_status" >&5
-+  echo "$as_me:18220: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17892: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18223: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17895: \$? = $ac_status" >&5
-+  echo "$as_me:18226: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -17904,7 +18235,7 @@
- done
- 
- fi
--echo "$as_me:17907: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:18238: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -17921,14 +18252,14 @@
- 
- fi
- 
--echo "$as_me:17924: checking if external environ is declared" >&5
-+echo "$as_me:18255: checking if external environ is declared" >&5
- echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
- if test "${cf_cv_dcl_environ+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-     cat >conftest.$ac_ext <<_ACEOF
--#line 17931 "configure"
-+#line 18262 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -17944,16 +18275,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17947: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18278: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17950: \$? = $ac_status" >&5
-+  echo "$as_me:18281: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17953: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18284: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17956: \$? = $ac_status" >&5
-+  echo "$as_me:18287: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_environ=yes
- else
-@@ -17964,7 +18295,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:17967: result: $cf_cv_dcl_environ" >&5
-+echo "$as_me:18298: result: $cf_cv_dcl_environ" >&5
- echo "${ECHO_T}$cf_cv_dcl_environ" >&6
- 
- if test "$cf_cv_dcl_environ" = no ; then
-@@ -17979,14 +18310,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:17982: checking if external environ exists" >&5
-+echo "$as_me:18313: checking if external environ exists" >&5
- echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
- if test "${cf_cv_have_environ+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17989 "configure"
-+#line 18320 "configure"
- #include "confdefs.h"
- 
- #undef environ
-@@ -18001,16 +18332,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18004: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18335: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18007: \$? = $ac_status" >&5
-+  echo "$as_me:18338: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18010: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18341: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18013: \$? = $ac_status" >&5
-+  echo "$as_me:18344: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_environ=yes
- else
-@@ -18021,7 +18352,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:18024: result: $cf_cv_have_environ" >&5
-+echo "$as_me:18355: result: $cf_cv_have_environ" >&5
- echo "${ECHO_T}$cf_cv_have_environ" >&6
- 
- if test "$cf_cv_have_environ" = yes ; then
-@@ -18034,13 +18365,13 @@
- 
- fi
- 
--echo "$as_me:18037: checking for getenv" >&5
-+echo "$as_me:18368: checking for getenv" >&5
- echo $ECHO_N "checking for getenv... $ECHO_C" >&6
- if test "${ac_cv_func_getenv+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18043 "configure"
-+#line 18374 "configure"
- #include "confdefs.h"
- #define getenv autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -18071,16 +18402,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18074: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18405: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18077: \$? = $ac_status" >&5
-+  echo "$as_me:18408: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18080: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18411: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18083: \$? = $ac_status" >&5
-+  echo "$as_me:18414: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_getenv=yes
- else
-@@ -18090,19 +18421,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18093: result: $ac_cv_func_getenv" >&5
-+echo "$as_me:18424: result: $ac_cv_func_getenv" >&5
- echo "${ECHO_T}$ac_cv_func_getenv" >&6
- 
- for ac_func in putenv setenv strdup
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:18099: checking for $ac_func" >&5
-+echo "$as_me:18430: 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 18105 "configure"
-+#line 18436 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -18133,16 +18464,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18136: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18467: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18139: \$? = $ac_status" >&5
-+  echo "$as_me:18470: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18142: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18473: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18145: \$? = $ac_status" >&5
-+  echo "$as_me:18476: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18152,7 +18483,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18155: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18486: 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 <&5
-+echo "$as_me:18496: checking if getenv returns consistent values" >&5
- echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
- if test "${cf_cv_consistent_getenv+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18172,7 +18503,7 @@
-   cf_cv_consistent_getenv=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18175 "configure"
-+#line 18506 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18281,15 +18612,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18284: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18615: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18287: \$? = $ac_status" >&5
-+  echo "$as_me:18618: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18289: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18620: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18292: \$? = $ac_status" >&5
-+  echo "$as_me:18623: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_consistent_getenv=yes
- else
-@@ -18302,7 +18633,7 @@
- fi
- 
- fi
--echo "$as_me:18305: result: $cf_cv_consistent_getenv" >&5
-+echo "$as_me:18636: result: $cf_cv_consistent_getenv" >&5
- echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
- 
- if test "x$cf_cv_consistent_getenv" = xno
-@@ -18317,7 +18648,7 @@
- if test "x$cf_cv_consistent_getenv" = xno && \
- 	test "x$cf_with_trace" = xyes
- then
--	{ echo "$as_me:18320: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
-+	{ echo "$as_me:18651: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
- echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
- fi
- 
-@@ -18325,7 +18656,7 @@
- # Note: even non-Posix ISC needs  to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--echo "$as_me:18328: checking for main in -lcposix" >&5
-+echo "$as_me:18659: 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
-@@ -18333,7 +18664,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18336 "configure"
-+#line 18667 "configure"
- #include "confdefs.h"
- 
- int
-@@ -18345,16 +18676,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18679: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18351: \$? = $ac_status" >&5
-+  echo "$as_me:18682: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18354: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18685: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18357: \$? = $ac_status" >&5
-+  echo "$as_me:18688: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -18365,7 +18696,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18368: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:18699: 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 <&5
-+	echo "$as_me:18710: 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
-@@ -18384,7 +18715,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18387 "configure"
-+#line 18718 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18403,16 +18734,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18406: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18737: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18409: \$? = $ac_status" >&5
-+  echo "$as_me:18740: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18412: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18743: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18415: \$? = $ac_status" >&5
-+  echo "$as_me:18746: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -18423,7 +18754,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18426: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:18757: 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
- 
-@@ -18446,14 +18777,14 @@
- fi
- fi
- 
--echo "$as_me:18449: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:18780: 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 18456 "configure"
-+#line 18787 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18473,16 +18804,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18476: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18807: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18479: \$? = $ac_status" >&5
-+  echo "$as_me:18810: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18482: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18813: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18485: \$? = $ac_status" >&5
-+  echo "$as_me:18816: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -18494,7 +18825,7 @@
- 
- fi
- 
--echo "$as_me:18497: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:18828: 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
-@@ -18509,13 +18840,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:18512: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:18843: 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 18518 "configure"
-+#line 18849 "configure"
- #include "confdefs.h"
- 
- int
-@@ -18573,16 +18904,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18576: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18907: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18579: \$? = $ac_status" >&5
-+  echo "$as_me:18910: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18582: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18913: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18585: \$? = $ac_status" >&5
-+  echo "$as_me:18916: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -18592,7 +18923,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18595: result: $ac_cv_c_const" >&5
-+echo "$as_me:18926: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -18602,7 +18933,7 @@
- 
- fi
- 
--echo "$as_me:18605: checking for inline" >&5
-+echo "$as_me:18936: 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
-@@ -18610,7 +18941,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18613 "configure"
-+#line 18944 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -18619,16 +18950,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18622: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18953: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18625: \$? = $ac_status" >&5
-+  echo "$as_me:18956: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18628: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18959: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18631: \$? = $ac_status" >&5
-+  echo "$as_me:18962: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -18639,7 +18970,7 @@
- done
- 
- fi
--echo "$as_me:18642: result: $ac_cv_c_inline" >&5
-+echo "$as_me:18973: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -18665,7 +18996,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		echo "$as_me:18668: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:18999: checking if $CC supports options to tune inlining" >&5
- echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18674,7 +19005,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 18677 "configure"
-+#line 19008 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -18686,16 +19017,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18689: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19020: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18692: \$? = $ac_status" >&5
-+  echo "$as_me:19023: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18695: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19026: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18698: \$? = $ac_status" >&5
-+  echo "$as_me:19029: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -18707,7 +19038,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:18710: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:19041: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
- 		if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -18813,7 +19144,7 @@
- 	fi
- fi
- 
--echo "$as_me:18816: checking for signal global datatype" >&5
-+echo "$as_me:19147: 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
-@@ -18825,7 +19156,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18828 "configure"
-+#line 19159 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18848,16 +19179,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19182: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18854: \$? = $ac_status" >&5
-+  echo "$as_me:19185: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19188: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18860: \$? = $ac_status" >&5
-+  echo "$as_me:19191: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -18871,7 +19202,7 @@
- 
- fi
- 
--echo "$as_me:18874: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:19205: 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 <&5
-+echo "$as_me:19214: 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
-@@ -18890,7 +19221,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18893 "configure"
-+#line 19224 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -18925,15 +19256,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18928: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19259: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18931: \$? = $ac_status" >&5
-+  echo "$as_me:19262: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18933: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18936: \$? = $ac_status" >&5
-+  echo "$as_me:19267: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -18948,7 +19279,7 @@
- 
- fi
- 
--echo "$as_me:18951: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:19282: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:19294: 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 18970 "configure"
-+#line 19301 "configure"
- #include "confdefs.h"
- 
- int
-@@ -18979,16 +19310,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18982: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19313: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18985: \$? = $ac_status" >&5
-+  echo "$as_me:19316: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18988: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19319: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18991: \$? = $ac_status" >&5
-+  echo "$as_me:19322: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -19000,7 +19331,7 @@
- 
- fi
- 
--echo "$as_me:19003: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:19334: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -19016,14 +19347,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:19019: checking if external errno is declared" >&5
-+echo "$as_me:19350: 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 19026 "configure"
-+#line 19357 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -19041,16 +19372,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19044: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19375: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19047: \$? = $ac_status" >&5
-+  echo "$as_me:19378: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19050: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19381: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19053: \$? = $ac_status" >&5
-+  echo "$as_me:19384: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -19061,7 +19392,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:19064: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:19395: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -19076,14 +19407,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:19079: checking if external errno exists" >&5
-+echo "$as_me:19410: 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 19086 "configure"
-+#line 19417 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -19098,16 +19429,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19101: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19432: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19104: \$? = $ac_status" >&5
-+  echo "$as_me:19435: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19107: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19438: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19110: \$? = $ac_status" >&5
-+  echo "$as_me:19441: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -19118,7 +19449,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:19121: result: $cf_cv_have_errno" >&5
-+echo "$as_me:19452: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -19131,7 +19462,7 @@
- 
- fi
- 
--echo "$as_me:19134: checking if data-only library module links" >&5
-+echo "$as_me:19465: 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
-@@ -19139,20 +19470,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:19476: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19148: \$? = $ac_status" >&5
-+  echo "$as_me:19479: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <&5
-+	if { (eval echo "$as_me:19499: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19171: \$? = $ac_status" >&5
-+  echo "$as_me:19502: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -19181,7 +19512,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19184 "configure"
-+#line 19515 "configure"
- #include "confdefs.h"
- 
- 	int main(void)
-@@ -19192,15 +19523,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:19195: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19526: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19198: \$? = $ac_status" >&5
-+  echo "$as_me:19529: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:19200: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19531: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19203: \$? = $ac_status" >&5
-+  echo "$as_me:19534: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -19215,7 +19546,7 @@
- 
- fi
- 
--echo "$as_me:19218: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:19549: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -19257,13 +19588,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:19260: checking for $ac_func" >&5
-+echo "$as_me:19591: 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 19266 "configure"
-+#line 19597 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -19294,16 +19625,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19297: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19628: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19300: \$? = $ac_status" >&5
-+  echo "$as_me:19631: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19303: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19634: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19306: \$? = $ac_status" >&5
-+  echo "$as_me:19637: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -19313,7 +19644,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:19316: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:19647: 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 <&5
-+	{ { echo "$as_me:19659: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19334,7 +19665,7 @@
- then
- 	if test "x$ac_cv_func_vsnprintf" = xyes
- 	then
--		{ echo "$as_me:19337: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
-+		{ echo "$as_me:19668: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
- echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
- 	else
- 
-@@ -19347,14 +19678,14 @@
- 
- if test "x$with_getcap" = "xyes" ; then
- 
--echo "$as_me:19350: checking for terminal-capability database functions" >&5
-+echo "$as_me:19681: 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 19357 "configure"
-+#line 19688 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19374,16 +19705,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19377: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19708: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19380: \$? = $ac_status" >&5
-+  echo "$as_me:19711: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19383: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19714: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19386: \$? = $ac_status" >&5
-+  echo "$as_me:19717: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -19394,7 +19725,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:19397: result: $cf_cv_cgetent" >&5
-+echo "$as_me:19728: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- 
- if test "$cf_cv_cgetent" = yes
-@@ -19404,14 +19735,14 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--echo "$as_me:19407: checking if cgetent uses const parameter" >&5
-+echo "$as_me:19738: checking if cgetent uses const parameter" >&5
- echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
- if test "${cf_cv_cgetent_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19414 "configure"
-+#line 19745 "configure"
- #include "confdefs.h"
- 
- #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
-@@ -19434,16 +19765,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19437: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19768: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19440: \$? = $ac_status" >&5
-+  echo "$as_me:19771: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19443: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19774: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19446: \$? = $ac_status" >&5
-+  echo "$as_me:19777: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -19454,7 +19785,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:19457: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:19788: result: $cf_cv_cgetent_const" >&5
- echo "${ECHO_T}$cf_cv_cgetent_const" >&6
- 	if test "$cf_cv_cgetent_const" = yes
- 	then
-@@ -19468,14 +19799,14 @@
- 
- fi
- 
--echo "$as_me:19471: checking for isascii" >&5
-+echo "$as_me:19802: 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 19478 "configure"
-+#line 19809 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -19487,16 +19818,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19490: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19821: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19493: \$? = $ac_status" >&5
-+  echo "$as_me:19824: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19496: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19827: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19499: \$? = $ac_status" >&5
-+  echo "$as_me:19830: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -19507,7 +19838,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:19510: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:19841: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -19515,10 +19846,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:19518: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:19849: 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 19521 "configure"
-+#line 19852 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19532,16 +19863,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19535: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19866: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19538: \$? = $ac_status" >&5
-+  echo "$as_me:19869: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19541: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19872: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19544: \$? = $ac_status" >&5
-+  echo "$as_me:19875: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -19549,7 +19880,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19552 "configure"
-+#line 19883 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -19564,16 +19895,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19567: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19898: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19570: \$? = $ac_status" >&5
-+  echo "$as_me:19901: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19904: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19576: \$? = $ac_status" >&5
-+  echo "$as_me:19907: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -19589,11 +19920,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:19592: result: $sigact_bad" >&5
-+echo "$as_me:19923: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:19596: checking if nanosleep really works" >&5
-+echo "$as_me:19927: 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
-@@ -19603,7 +19934,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19606 "configure"
-+#line 19937 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19628,15 +19959,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:19631: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19962: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19634: \$? = $ac_status" >&5
-+  echo "$as_me:19965: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:19636: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19967: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19639: \$? = $ac_status" >&5
-+  echo "$as_me:19970: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -19648,7 +19979,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:19651: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:19982: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -19665,23 +19996,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19668: checking for $ac_header" >&5
-+echo "$as_me:19999: 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 19674 "configure"
-+#line 20005 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19678: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20009: \"$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:19684: \$? = $ac_status" >&5
-+  echo "$as_me:20015: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -19700,7 +20031,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19703: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20034: 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 <&5
-+	echo "$as_me:20051: 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 19723 "configure"
-+#line 20054 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -19732,16 +20063,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19735: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20066: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19738: \$? = $ac_status" >&5
-+  echo "$as_me:20069: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19741: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20072: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19744: \$? = $ac_status" >&5
-+  echo "$as_me:20075: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -19749,7 +20080,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 19752 "configure"
-+#line 20083 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -19763,16 +20094,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19766: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20097: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19769: \$? = $ac_status" >&5
-+  echo "$as_me:20100: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19772: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20103: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19775: \$? = $ac_status" >&5
-+  echo "$as_me:20106: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -19788,19 +20119,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:19791: result: $termios_bad" >&5
-+	echo "$as_me:20122: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:19796: checking for tcgetattr" >&5
-+echo "$as_me:20127: 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 19803 "configure"
-+#line 20134 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19828,16 +20159,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20162: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19834: \$? = $ac_status" >&5
-+  echo "$as_me:20165: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19837: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20168: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19840: \$? = $ac_status" >&5
-+  echo "$as_me:20171: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -19847,21 +20178,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:19850: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:20181: 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:19857: checking for vsscanf function or workaround" >&5
-+echo "$as_me:20188: 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 19864 "configure"
-+#line 20195 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19877,16 +20208,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19880: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20211: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19883: \$? = $ac_status" >&5
-+  echo "$as_me:20214: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19886: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20217: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19889: \$? = $ac_status" >&5
-+  echo "$as_me:20220: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -19894,7 +20225,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19897 "configure"
-+#line 20228 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19916,16 +20247,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19919: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20250: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19922: \$? = $ac_status" >&5
-+  echo "$as_me:20253: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19925: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20256: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19928: \$? = $ac_status" >&5
-+  echo "$as_me:20259: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -19933,7 +20264,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19936 "configure"
-+#line 20267 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19955,16 +20286,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19958: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20289: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19961: \$? = $ac_status" >&5
-+  echo "$as_me:20292: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19964: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20295: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19967: \$? = $ac_status" >&5
-+  echo "$as_me:20298: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -19979,7 +20310,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:19982: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:20313: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in
-@@ -20005,23 +20336,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:20008: checking for $ac_header" >&5
-+echo "$as_me:20339: 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 20014 "configure"
-+#line 20345 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:20018: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20349: \"$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:20024: \$? = $ac_status" >&5
-+  echo "$as_me:20355: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -20040,7 +20371,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:20043: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20374: 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 <&5
-+echo "$as_me:20384: 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
-@@ -20061,7 +20392,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20064 "configure"
-+#line 20395 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20102,15 +20433,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20105: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20108: \$? = $ac_status" >&5
-+  echo "$as_me:20439: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20110: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20441: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20113: \$? = $ac_status" >&5
-+  echo "$as_me:20444: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -20125,16 +20456,16 @@
- fi
- 
- fi
--echo "$as_me:20128: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:20459: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:20131: checking for mkstemp" >&5
-+	echo "$as_me:20462: 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 20137 "configure"
-+#line 20468 "configure"
- #include "confdefs.h"
- #define mkstemp autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -20165,16 +20496,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20499: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20171: \$? = $ac_status" >&5
-+  echo "$as_me:20502: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20174: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20505: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20177: \$? = $ac_status" >&5
-+  echo "$as_me:20508: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -20184,7 +20515,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20187: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:20518: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -20205,21 +20536,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:20208: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:20539: 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:20211: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:20542: 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:20217: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:20548: 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 20222 "configure"
-+#line 20553 "configure"
- #include "confdefs.h"
- #include 
- /* If setvbuf has the reversed format, exit 0. */
-@@ -20236,15 +20567,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20239: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20570: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20242: \$? = $ac_status" >&5
-+  echo "$as_me:20573: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20244: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20575: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20247: \$? = $ac_status" >&5
-+  echo "$as_me:20578: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -20257,7 +20588,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:20260: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:20591: 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
- 
-@@ -20268,13 +20599,13 @@
- fi
- 
- fi
--echo "$as_me:20271: checking for intptr_t" >&5
-+echo "$as_me:20602: checking for intptr_t" >&5
- echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
- if test "${ac_cv_type_intptr_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20277 "configure"
-+#line 20608 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -20289,16 +20620,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20292: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20623: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20295: \$? = $ac_status" >&5
-+  echo "$as_me:20626: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20298: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20629: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20301: \$? = $ac_status" >&5
-+  echo "$as_me:20632: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_intptr_t=yes
- else
-@@ -20308,7 +20639,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:20311: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:20642: result: $ac_cv_type_intptr_t" >&5
- echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
- if test $ac_cv_type_intptr_t = yes; then
-   :
-@@ -20320,13 +20651,13 @@
- 
- fi
- 
--echo "$as_me:20323: checking for ssize_t" >&5
-+echo "$as_me:20654: checking for ssize_t" >&5
- echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
- if test "${ac_cv_type_ssize_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20329 "configure"
-+#line 20660 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -20341,16 +20672,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20344: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20675: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20347: \$? = $ac_status" >&5
-+  echo "$as_me:20678: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20350: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20681: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20353: \$? = $ac_status" >&5
-+  echo "$as_me:20684: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_ssize_t=yes
- else
-@@ -20360,7 +20691,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:20363: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:20694: result: $ac_cv_type_ssize_t" >&5
- echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
- if test $ac_cv_type_ssize_t = yes; then
-   :
-@@ -20372,14 +20703,14 @@
- 
- fi
- 
--echo "$as_me:20375: checking for type sigaction_t" >&5
-+echo "$as_me:20706: 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 20382 "configure"
-+#line 20713 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20392,16 +20723,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20395: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20726: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20398: \$? = $ac_status" >&5
-+  echo "$as_me:20729: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20401: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20732: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20404: \$? = $ac_status" >&5
-+  echo "$as_me:20735: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -20412,14 +20743,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:20415: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:20746: 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:20422: checking declaration of size-change" >&5
-+echo "$as_me:20753: 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
-@@ -20440,7 +20771,7 @@
- 
- 	fi
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20443 "configure"
-+#line 20774 "configure"
- #include "confdefs.h"
- #include 
- #ifdef HAVE_TERMIOS_H
-@@ -20486,16 +20817,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20489: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20820: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20492: \$? = $ac_status" >&5
-+  echo "$as_me:20823: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20495: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20826: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20498: \$? = $ac_status" >&5
-+  echo "$as_me:20829: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -20514,7 +20845,7 @@
- done
- 
- fi
--echo "$as_me:20517: result: $cf_cv_sizechange" >&5
-+echo "$as_me:20848: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 
-@@ -20532,13 +20863,13 @@
- 	esac
- fi
- 
--echo "$as_me:20535: checking for memmove" >&5
-+echo "$as_me:20866: 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 20541 "configure"
-+#line 20872 "configure"
- #include "confdefs.h"
- #define memmove autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -20569,16 +20900,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20572: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20903: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20575: \$? = $ac_status" >&5
-+  echo "$as_me:20906: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20578: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20909: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20581: \$? = $ac_status" >&5
-+  echo "$as_me:20912: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -20588,19 +20919,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20591: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:20922: 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:20597: checking for bcopy" >&5
-+echo "$as_me:20928: 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 20603 "configure"
-+#line 20934 "configure"
- #include "confdefs.h"
- #define bcopy autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -20631,16 +20962,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20634: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20965: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20637: \$? = $ac_status" >&5
-+  echo "$as_me:20968: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20971: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20643: \$? = $ac_status" >&5
-+  echo "$as_me:20974: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -20650,11 +20981,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20653: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:20984: 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:20657: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:20988: 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
-@@ -20664,7 +20995,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20667 "configure"
-+#line 20998 "configure"
- #include "confdefs.h"
- 
- int main(void) {
-@@ -20678,15 +21009,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20681: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21012: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20684: \$? = $ac_status" >&5
-+  echo "$as_me:21015: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21017: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20689: \$? = $ac_status" >&5
-+  echo "$as_me:21020: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -20699,7 +21030,7 @@
- fi
- 
- fi
--echo "$as_me:20702: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:21033: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -20726,13 +21057,13 @@
- for ac_func in posix_openpt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:20729: checking for $ac_func" >&5
-+echo "$as_me:21060: 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 20735 "configure"
-+#line 21066 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -20763,16 +21094,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20766: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21097: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20769: \$? = $ac_status" >&5
-+  echo "$as_me:21100: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20772: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21103: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20775: \$? = $ac_status" >&5
-+  echo "$as_me:21106: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -20782,7 +21113,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20785: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:21116: 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 <&5
-+echo "$as_me:21126: 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
-@@ -20802,7 +21133,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20805 "configure"
-+#line 21136 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20854,15 +21185,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20857: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21188: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20860: \$? = $ac_status" >&5
-+  echo "$as_me:21191: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20862: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21193: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20865: \$? = $ac_status" >&5
-+  echo "$as_me:21196: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -20874,21 +21205,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:20877: result: $cf_cv_working_poll" >&5
-+echo "$as_me:21208: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:20884: checking for va_copy" >&5
-+echo "$as_me:21215: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 20891 "configure"
-+#line 21222 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20905,16 +21236,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20908: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21239: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20911: \$? = $ac_status" >&5
-+  echo "$as_me:21242: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20914: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21245: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20917: \$? = $ac_status" >&5
-+  echo "$as_me:21248: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -20924,7 +21255,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20927: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:21258: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- if test "$cf_cv_have_va_copy" = yes;
-@@ -20936,14 +21267,14 @@
- 
- else # !cf_cv_have_va_copy
- 
--echo "$as_me:20939: checking for __va_copy" >&5
-+echo "$as_me:21270: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 20946 "configure"
-+#line 21277 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -20960,16 +21291,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20963: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21294: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20966: \$? = $ac_status" >&5
-+  echo "$as_me:21297: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20969: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21300: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20972: \$? = $ac_status" >&5
-+  echo "$as_me:21303: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -20979,7 +21310,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:20982: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:21313: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- if test "$cf_cv_have___va_copy" = yes
-@@ -20991,14 +21322,14 @@
- 
- else # !cf_cv_have___va_copy
- 
--echo "$as_me:20994: checking for __builtin_va_copy" >&5
-+echo "$as_me:21325: checking for __builtin_va_copy" >&5
- echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___builtin_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 21001 "configure"
-+#line 21332 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -21015,16 +21346,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21018: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21349: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21021: \$? = $ac_status" >&5
-+  echo "$as_me:21352: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21024: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21355: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21027: \$? = $ac_status" >&5
-+  echo "$as_me:21358: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___builtin_va_copy=yes
- else
-@@ -21034,7 +21365,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:21037: result: $cf_cv_have___builtin_va_copy" >&5
-+echo "$as_me:21368: result: $cf_cv_have___builtin_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
- 
- test "$cf_cv_have___builtin_va_copy" = yes &&
-@@ -21052,14 +21383,14 @@
- 	;;
- 
- (*)
--	echo "$as_me:21055: checking if we can simply copy va_list" >&5
-+	echo "$as_me:21386: checking if we can simply copy va_list" >&5
- echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
- if test "${cf_cv_pointer_va_list+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 21062 "configure"
-+#line 21393 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -21076,16 +21407,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21079: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21410: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21082: \$? = $ac_status" >&5
-+  echo "$as_me:21413: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21085: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21416: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21088: \$? = $ac_status" >&5
-+  echo "$as_me:21419: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_pointer_va_list=yes
- else
-@@ -21095,19 +21426,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:21098: result: $cf_cv_pointer_va_list" >&5
-+echo "$as_me:21429: result: $cf_cv_pointer_va_list" >&5
- echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
- 
- 	if test "$cf_cv_pointer_va_list" = no
- 	then
--		echo "$as_me:21103: checking if we can copy va_list indirectly" >&5
-+		echo "$as_me:21434: checking if we can copy va_list indirectly" >&5
- echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
- if test "${cf_cv_array_va_list+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 21110 "configure"
-+#line 21441 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -21124,16 +21455,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21127: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21458: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21130: \$? = $ac_status" >&5
-+  echo "$as_me:21461: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21133: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21464: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21136: \$? = $ac_status" >&5
-+  echo "$as_me:21467: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_array_va_list=yes
- else
-@@ -21143,7 +21474,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:21146: result: $cf_cv_array_va_list" >&5
-+echo "$as_me:21477: result: $cf_cv_array_va_list" >&5
- echo "${ECHO_T}$cf_cv_array_va_list" >&6
- 		test "$cf_cv_array_va_list" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -21154,13 +21485,13 @@
- 	;;
- esac
- 
--echo "$as_me:21157: checking for pid_t" >&5
-+echo "$as_me:21488: checking for pid_t" >&5
- echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
- if test "${ac_cv_type_pid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21163 "configure"
-+#line 21494 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21175,16 +21506,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21509: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21181: \$? = $ac_status" >&5
-+  echo "$as_me:21512: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21515: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21187: \$? = $ac_status" >&5
-+  echo "$as_me:21518: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -21194,7 +21525,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21197: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:21528: result: $ac_cv_type_pid_t" >&5
- echo "${ECHO_T}$ac_cv_type_pid_t" >&6
- if test $ac_cv_type_pid_t = yes; then
-   :
-@@ -21209,23 +21540,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:21212: checking for $ac_header" >&5
-+echo "$as_me:21543: 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 21218 "configure"
-+#line 21549 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:21222: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:21553: \"$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:21228: \$? = $ac_status" >&5
-+  echo "$as_me:21559: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -21244,7 +21575,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:21247: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:21578: 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 <&5
-+echo "$as_me:21591: 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 21266 "configure"
-+#line 21597 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -21294,16 +21625,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21297: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21628: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21300: \$? = $ac_status" >&5
-+  echo "$as_me:21631: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21303: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21634: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21306: \$? = $ac_status" >&5
-+  echo "$as_me:21637: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -21313,7 +21644,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:21316: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:21647: 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 <&5
-+  echo "$as_me:21659: checking for working fork" >&5
- echo $ECHO_N "checking for working fork... $ECHO_C" >&6
- if test "${ac_cv_func_fork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21348,15 +21679,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21351: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21682: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21354: \$? = $ac_status" >&5
-+  echo "$as_me:21685: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21356: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21687: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21359: \$? = $ac_status" >&5
-+  echo "$as_me:21690: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -21368,7 +21699,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:21371: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:21702: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -21382,12 +21713,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:21385: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:21716: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
- fi
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:21390: checking for working vfork" >&5
-+  echo "$as_me:21721: checking for working vfork" >&5
- echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
- if test "${ac_cv_func_vfork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21396,7 +21727,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21399 "configure"
-+#line 21730 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include 
-@@ -21493,15 +21824,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21496: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21827: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21499: \$? = $ac_status" >&5
-+  echo "$as_me:21830: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21501: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21832: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21504: \$? = $ac_status" >&5
-+  echo "$as_me:21835: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -21513,13 +21844,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:21516: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:21847: result: $ac_cv_func_vfork_works" >&5
- echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
- 
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-   ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:21522: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:21853: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
- fi
- 
-@@ -21544,7 +21875,7 @@
- 
- fi
- 
--echo "$as_me:21547: checking if fopen accepts explicit binary mode" >&5
-+echo "$as_me:21878: checking if fopen accepts explicit binary mode" >&5
- echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
- if test "${cf_cv_fopen_bin_r+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21554,7 +21885,7 @@
-   cf_cv_fopen_bin_r=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21557 "configure"
-+#line 21888 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -21587,15 +21918,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21590: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21921: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21593: \$? = $ac_status" >&5
-+  echo "$as_me:21924: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21595: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21598: \$? = $ac_status" >&5
-+  echo "$as_me:21929: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fopen_bin_r=yes
- else
-@@ -21608,7 +21939,7 @@
- fi
- 
- fi
--echo "$as_me:21611: result: $cf_cv_fopen_bin_r" >&5
-+echo "$as_me:21942: result: $cf_cv_fopen_bin_r" >&5
- echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
- test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF
- #define USE_FOPEN_BIN_R 1
-@@ -21616,7 +21947,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:21619: checking for openpty in -lutil" >&5
-+echo "$as_me:21950: 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
-@@ -21624,7 +21955,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 21627 "configure"
-+#line 21958 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -21643,16 +21974,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21646: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21977: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21649: \$? = $ac_status" >&5
-+  echo "$as_me:21980: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21652: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21983: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21655: \$? = $ac_status" >&5
-+  echo "$as_me:21986: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -21663,7 +21994,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:21666: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:21997: 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
-@@ -21671,7 +22002,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:21674: checking for openpty header" >&5
-+echo "$as_me:22005: 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
-@@ -21698,7 +22029,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21701 "configure"
-+#line 22032 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -21715,16 +22046,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21718: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:22049: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21721: \$? = $ac_status" >&5
-+  echo "$as_me:22052: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21724: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22055: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21727: \$? = $ac_status" >&5
-+  echo "$as_me:22058: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -21742,7 +22073,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:21745: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:22076: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -21815,7 +22146,7 @@
- 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
- 
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 21818 "configure"
-+#line 22149 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -21827,16 +22158,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21830: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:22161: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21833: \$? = $ac_status" >&5
-+  echo "$as_me:22164: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22167: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21839: \$? = $ac_status" >&5
-+  echo "$as_me:22170: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -21853,7 +22184,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:21856: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:22187: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -21889,7 +22220,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}:21892: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:22223: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -21900,7 +22231,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:21903: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:22234: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -21972,7 +22303,7 @@
- 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
- 
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 21975 "configure"
-+#line 22306 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -21984,16 +22315,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21987: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:22318: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21990: \$? = $ac_status" >&5
-+  echo "$as_me:22321: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21993: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22324: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21996: \$? = $ac_status" >&5
-+  echo "$as_me:22327: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -22010,7 +22341,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:22013: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:22344: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -22090,7 +22421,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}:22093: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:22424: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -22107,23 +22438,23 @@
- 	fi
- esac
- 
--echo "$as_me:22110: checking for db.h" >&5
-+echo "$as_me:22441: 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 22116 "configure"
-+#line 22447 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:22120: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:22451: \"$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:22126: \$? = $ac_status" >&5
-+  echo "$as_me:22457: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -22142,11 +22473,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:22145: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:22476: 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:22149: checking for version of db" >&5
-+echo "$as_me:22480: 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
-@@ -22157,10 +22488,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:22160: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:22491: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22163 "configure"
-+#line 22494 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -22190,16 +22521,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22193: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:22524: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:22196: \$? = $ac_status" >&5
-+  echo "$as_me:22527: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22199: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22530: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22202: \$? = $ac_status" >&5
-+  echo "$as_me:22533: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -22213,16 +22544,16 @@
- done
- 
- fi
--echo "$as_me:22216: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:22547: 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:22220: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:22551: 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:22225: checking for db libraries" >&5
-+echo "$as_me:22556: 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
-@@ -22252,10 +22583,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:22255: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:22586: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22258 "configure"
-+#line 22589 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -22310,16 +22641,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:22313: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:22644: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:22316: \$? = $ac_status" >&5
-+  echo "$as_me:22647: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:22319: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22650: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22322: \$? = $ac_status" >&5
-+  echo "$as_me:22653: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -22339,11 +22670,11 @@
- done
- 
- fi
--echo "$as_me:22342: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:22673: 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:22346: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:22677: 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
-@@ -22369,7 +22700,7 @@
- 
- else
- 
--	{ { echo "$as_me:22372: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:22703: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -22384,7 +22715,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:22387: checking if we should include stdbool.h" >&5
-+echo "$as_me:22718: 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
-@@ -22392,7 +22723,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22395 "configure"
-+#line 22726 "configure"
- #include "confdefs.h"
- 
- int
-@@ -22404,23 +22735,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22407: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:22738: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:22410: \$? = $ac_status" >&5
-+  echo "$as_me:22741: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22413: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22744: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22416: \$? = $ac_status" >&5
-+  echo "$as_me:22747: \$? = $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 22423 "configure"
-+#line 22754 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -22436,16 +22767,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22439: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:22770: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:22442: \$? = $ac_status" >&5
-+  echo "$as_me:22773: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22776: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22448: \$? = $ac_status" >&5
-+  echo "$as_me:22779: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -22459,13 +22790,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:22462: result: yes" >&5
-+then	echo "$as_me:22793: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:22464: result: no" >&5
-+else	echo "$as_me:22795: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:22468: checking for builtin bool type" >&5
-+echo "$as_me:22799: 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
-@@ -22473,7 +22804,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22476 "configure"
-+#line 22807 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -22488,16 +22819,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22491: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:22822: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:22494: \$? = $ac_status" >&5
-+  echo "$as_me:22825: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22497: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22828: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22500: \$? = $ac_status" >&5
-+  echo "$as_me:22831: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -22510,9 +22841,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:22513: result: yes" >&5
-+then	echo "$as_me:22844: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:22515: result: no" >&5
-+else	echo "$as_me:22846: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22529,10 +22860,10 @@
- 
- 	cf_save="$LIBS"
- 	LIBS="$LIBS $CXXLIBS"
--	echo "$as_me:22532: checking if we already have C++ library" >&5
-+	echo "$as_me:22863: checking if we already have C++ library" >&5
- echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22535 "configure"
-+#line 22866 "configure"
- #include "confdefs.h"
- 
- 			#include 
-@@ -22546,16 +22877,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:22549: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:22880: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:22552: \$? = $ac_status" >&5
-+  echo "$as_me:22883: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:22555: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22886: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22558: \$? = $ac_status" >&5
-+  echo "$as_me:22889: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_libstdcpp=yes
- else
-@@ -22564,7 +22895,7 @@
- cf_have_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:22567: result: $cf_have_libstdcpp" >&5
-+	echo "$as_me:22898: result: $cf_have_libstdcpp" >&5
- echo "${ECHO_T}$cf_have_libstdcpp" >&6
- 	LIBS="$cf_save"
- 
-@@ -22583,7 +22914,7 @@
- 			;;
- 		esac
- 
--		echo "$as_me:22586: checking for library $cf_stdcpp_libname" >&5
-+		echo "$as_me:22917: 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
-@@ -22609,7 +22940,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 22612 "configure"
-+#line 22943 "configure"
- #include "confdefs.h"
- 
- 				#include 
-@@ -22623,16 +22954,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:22626: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:22957: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:22629: \$? = $ac_status" >&5
-+  echo "$as_me:22960: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:22963: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22635: \$? = $ac_status" >&5
-+  echo "$as_me:22966: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -22644,7 +22975,7 @@
- 			LIBS="$cf_save"
- 
- fi
--echo "$as_me:22647: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:22978: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- 		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -22666,7 +22997,7 @@
- 	fi
- fi
- 
--	echo "$as_me:22669: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:23000: 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
-@@ -22681,15 +23012,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 $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:22684: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:23015: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22687: \$? = $ac_status" >&5
-+  echo "$as_me:23018: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:22689: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:23020: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22692: \$? = $ac_status" >&5
-+  echo "$as_me:23023: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -22700,10 +23031,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:22703: result: yes" >&5
-+  echo "$as_me:23034: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:22706: result: no" >&5
-+  echo "$as_me:23037: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22723,7 +23054,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:22726: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:23057: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -22744,7 +23075,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 22747 "configure"
-+#line 23078 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -22758,16 +23089,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:22761: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:23092: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:22764: \$? = $ac_status" >&5
-+  echo "$as_me:23095: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:22767: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23098: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22770: \$? = $ac_status" >&5
-+  echo "$as_me:23101: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -22804,7 +23135,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 22807 "configure"
-+#line 23138 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -22818,16 +23149,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:22821: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:23152: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:22824: \$? = $ac_status" >&5
-+  echo "$as_me:23155: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:22827: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23158: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:22830: \$? = $ac_status" >&5
-+  echo "$as_me:23161: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -22860,7 +23191,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:22863: result: $cf_cxx_library" >&5
-+	echo "$as_me:23194: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -22876,7 +23207,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:22879: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:23210: 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
-@@ -22893,18 +23224,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 22896 "configure"
-+#line 23227 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:22901: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:23232: \"$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:22907: \$? = $ac_status" >&5
-+  echo "$as_me:23238: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -22927,17 +23258,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 22930 "configure"
-+#line 23261 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:22934: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:23265: \"$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:22940: \$? = $ac_status" >&5
-+  echo "$as_me:23271: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -22974,7 +23305,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:22977: result: $CXXCPP" >&5
-+echo "$as_me:23308: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -22984,18 +23315,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 22987 "configure"
-+#line 23318 "configure"
- #include "confdefs.h"
- #include 
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:22992: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:23323: \"$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:22998: \$? = $ac_status" >&5
-+  echo "$as_me:23329: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -23018,17 +23349,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 23021 "configure"
-+#line 23352 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:23025: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:23356: \"$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:23031: \$? = $ac_status" >&5
-+  echo "$as_me:23362: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -23056,7 +23387,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:23059: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:23390: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -23071,23 +23402,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:23074: checking for $ac_header" >&5
-+echo "$as_me:23405: 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 23080 "configure"
-+#line 23411 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:23084: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:23415: \"$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:23090: \$? = $ac_status" >&5
-+  echo "$as_me:23421: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -23106,7 +23437,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:23109: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:23440: 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 <&5
-+echo "$as_me:23453: 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 23128 "configure"
-+#line 23459 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:23132: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:23463: \"$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:23138: \$? = $ac_status" >&5
-+  echo "$as_me:23469: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -23154,7 +23485,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:23157: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:23488: 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 <&5
-+	echo "$as_me:23499: 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 23171 "configure"
-+#line 23502 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -23185,16 +23516,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:23188: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23519: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:23191: \$? = $ac_status" >&5
-+  echo "$as_me:23522: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:23194: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23525: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23197: \$? = $ac_status" >&5
-+  echo "$as_me:23528: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -23203,7 +23534,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:23206: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:23537: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -23214,7 +23545,7 @@
- 	fi
- fi
- 
--echo "$as_me:23217: checking if we should include stdbool.h" >&5
-+echo "$as_me:23548: 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
-@@ -23222,7 +23553,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 23225 "configure"
-+#line 23556 "configure"
- #include "confdefs.h"
- 
- int
-@@ -23234,23 +23565,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:23237: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23568: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:23240: \$? = $ac_status" >&5
-+  echo "$as_me:23571: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23574: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23246: \$? = $ac_status" >&5
-+  echo "$as_me:23577: \$? = $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 23253 "configure"
-+#line 23584 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -23266,16 +23597,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:23269: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23600: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:23272: \$? = $ac_status" >&5
-+  echo "$as_me:23603: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:23275: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23606: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23278: \$? = $ac_status" >&5
-+  echo "$as_me:23609: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -23289,13 +23620,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:23292: result: yes" >&5
-+then	echo "$as_me:23623: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:23294: result: no" >&5
-+else	echo "$as_me:23625: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:23298: checking for builtin bool type" >&5
-+echo "$as_me:23629: 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
-@@ -23303,7 +23634,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 23306 "configure"
-+#line 23637 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -23318,16 +23649,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:23321: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23652: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:23324: \$? = $ac_status" >&5
-+  echo "$as_me:23655: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:23327: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23658: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23330: \$? = $ac_status" >&5
-+  echo "$as_me:23661: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -23340,13 +23671,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:23343: result: yes" >&5
-+then	echo "$as_me:23674: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:23345: result: no" >&5
-+else	echo "$as_me:23676: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:23349: checking for size of bool" >&5
-+echo "$as_me:23680: 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
-@@ -23357,7 +23688,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 23360 "configure"
-+#line 23691 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -23399,15 +23730,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:23402: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:23733: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:23405: \$? = $ac_status" >&5
-+  echo "$as_me:23736: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:23407: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23738: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23410: \$? = $ac_status" >&5
-+  echo "$as_me:23741: \$? = $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
-@@ -23425,18 +23756,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:23428: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:23759: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:23434: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:23765: 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:23439: checking for special defines needed for etip.h" >&5
-+echo "$as_me:23770: 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"
-@@ -23454,7 +23785,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 23457 "configure"
-+#line 23788 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -23468,16 +23799,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:23471: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23802: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:23474: \$? = $ac_status" >&5
-+  echo "$as_me:23805: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:23477: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23808: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23480: \$? = $ac_status" >&5
-+  echo "$as_me:23811: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <&5
-+echo "$as_me:23832: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:23506: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:23837: 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
-@@ -23520,7 +23851,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 23523 "configure"
-+#line 23854 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -23539,15 +23870,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:23542: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:23873: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:23545: \$? = $ac_status" >&5
-+  echo "$as_me:23876: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:23547: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23878: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23550: \$? = $ac_status" >&5
-+  echo "$as_me:23881: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -23566,7 +23897,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:23569: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:23900: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -23576,7 +23907,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:23579: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:23910: 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
-@@ -23590,7 +23921,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 23593 "configure"
-+#line 23924 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -23634,16 +23965,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:23637: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:23968: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:23640: \$? = $ac_status" >&5
-+  echo "$as_me:23971: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:23643: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:23974: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23646: \$? = $ac_status" >&5
-+  echo "$as_me:23977: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -23661,7 +23992,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:23664: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:23995: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -23710,7 +24041,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:23713: checking for size of bool" >&5
-+echo "$as_me:24044: 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
-@@ -23721,7 +24052,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 23724 "configure"
-+#line 24055 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -23763,15 +24094,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:23766: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:24097: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:23769: \$? = $ac_status" >&5
-+  echo "$as_me:24100: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:23771: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24102: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:23774: \$? = $ac_status" >&5
-+  echo "$as_me:24105: \$? = $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
-@@ -23789,25 +24120,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:23792: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:24123: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:23798: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:24129: 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:23804: checking for fallback type of bool" >&5
-+			echo "$as_me:24135: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:23810: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:24141: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -23836,7 +24167,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:23839: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:24170: 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
-@@ -23848,7 +24179,7 @@
- cf_ada_config="#"
- # 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:23851: checking for $ac_word" >&5
-+echo "$as_me:24182: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnatmake_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -23863,7 +24194,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnatmake_exists="yes"
--echo "$as_me:23866: found $ac_dir/$ac_word" >&5
-+echo "$as_me:24197: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -23872,10 +24203,10 @@
- fi
- gnatmake_exists=$ac_cv_prog_gnatmake_exists
- if test -n "$gnatmake_exists"; then
--  echo "$as_me:23875: result: $gnatmake_exists" >&5
-+  echo "$as_me:24206: result: $gnatmake_exists" >&5
- echo "${ECHO_T}$gnatmake_exists" >&6
- else
--  echo "$as_me:23878: result: no" >&5
-+  echo "$as_me:24209: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -23885,7 +24216,7 @@
- else
- 	# Extract the first word of "gprconfig", so it can be a program name with args.
- set dummy gprconfig; ac_word=$2
--echo "$as_me:23888: checking for $ac_word" >&5
-+echo "$as_me:24219: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gprconfig_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -23900,7 +24231,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gprconfig_exists="yes"
--echo "$as_me:23903: found $ac_dir/$ac_word" >&5
-+echo "$as_me:24234: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -23909,10 +24240,10 @@
- fi
- gprconfig_exists=$ac_cv_prog_gprconfig_exists
- if test -n "$gprconfig_exists"; then
--  echo "$as_me:23912: result: $gprconfig_exists" >&5
-+  echo "$as_me:24243: result: $gprconfig_exists" >&5
- echo "${ECHO_T}$gprconfig_exists" >&6
- else
--  echo "$as_me:23915: result: no" >&5
-+  echo "$as_me:24246: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -23925,7 +24256,7 @@
- 			cd conftest.src
- 			for cf_gprconfig in Ada C
- 			do
--				echo "$as_me:23928: checking for gprconfig name for $cf_gprconfig" >&5
-+				echo "$as_me:24259: checking for gprconfig name for $cf_gprconfig" >&5
- echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
- 				if test $cf_gprconfig = C
- 				then
-@@ -23944,10 +24275,10 @@
- 				if test -n "$cf_gprconfig_value"
- 				then
- 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
--					echo "$as_me:23947: result: $cf_gprconfig_value" >&5
-+					echo "$as_me:24278: result: $cf_gprconfig_value" >&5
- echo "${ECHO_T}$cf_gprconfig_value" >&6
- 				else
--					echo "$as_me:23950: result: missing" >&5
-+					echo "$as_me:24281: result: missing" >&5
- echo "${ECHO_T}missing" >&6
- 					cf_ada_config="#"
- 					break
-@@ -23963,12 +24294,12 @@
- 	if test "x$cf_ada_config" != "x#"
- 	then
- 
--echo "$as_me:23966: checking for gnat version" >&5
-+echo "$as_me:24297: 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:23971: result: $cf_gnat_version" >&5
-+echo "$as_me:24302: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -23976,7 +24307,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:23979: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:24310: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -23984,7 +24315,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:23987: checking for $ac_word" >&5
-+echo "$as_me:24318: 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
-@@ -23999,7 +24330,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:24002: found $ac_dir/$ac_word" >&5
-+echo "$as_me:24333: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -24008,10 +24339,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:24011: result: $M4_exists" >&5
-+  echo "$as_me:24342: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:24014: result: no" >&5
-+  echo "$as_me:24345: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -24020,7 +24351,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:24023: checking if GNAT works" >&5
-+			echo "$as_me:24354: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -24048,7 +24379,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--			echo "$as_me:24051: result: $cf_cv_prog_gnat_correct" >&5
-+			echo "$as_me:24382: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 		fi
- 	else
-@@ -24060,7 +24391,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:24063: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:24394: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -24077,10 +24408,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:24080: result: $ADAFLAGS" >&5
-+	echo "$as_me:24411: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:24083: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:24414: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -24090,11 +24421,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:24093: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:24424: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:24097: checking if GNAT supports generics" >&5
-+echo "$as_me:24428: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -24104,7 +24435,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:24107: result: $cf_gnat_generics" >&5
-+echo "$as_me:24438: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -24116,7 +24447,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:24119: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:24450: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -24164,7 +24495,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:24167: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:24498: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -24177,7 +24508,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:24180: checking if GNAT supports project files" >&5
-+echo "$as_me:24511: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -24240,15 +24571,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:24243: result: $cf_gnat_projects" >&5
-+echo "$as_me:24574: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:24249: checking if GNAT supports libraries" >&5
-+	echo "$as_me:24580: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:24251: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:24582: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -24268,7 +24599,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:24271: checking for ada-compiler" >&5
-+echo "$as_me:24602: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -24279,12 +24610,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:24282: result: $cf_ada_compiler" >&5
-+echo "$as_me:24613: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:24287: checking for ada-include" >&5
-+echo "$as_me:24618: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -24320,7 +24651,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:24323: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:24654: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -24329,10 +24660,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:24332: result: $ADA_INCLUDE" >&5
-+echo "$as_me:24663: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:24335: checking for ada-objects" >&5
-+echo "$as_me:24666: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -24368,7 +24699,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:24371: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:24702: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -24377,10 +24708,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:24380: result: $ADA_OBJECTS" >&5
-+echo "$as_me:24711: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:24383: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:24714: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -24390,14 +24721,14 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:24393: result: $with_ada_sharedlib" >&5
-+echo "$as_me:24724: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- if test "x$with_ada_sharedlib" != xno
- then
- 	if test "x$cf_gnat_projects" != xyes
- 	then
--		{ echo "$as_me:24400: WARNING: disabling shared-library since GNAT projects are not supported" >&5
-+		{ echo "$as_me:24731: WARNING: disabling shared-library since GNAT projects are not supported" >&5
- echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
- 		with_ada_sharedlib=no
- 	fi
-@@ -24423,13 +24754,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:24426: checking for wchar_t" >&5
-+	echo "$as_me:24757: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 24432 "configure"
-+#line 24763 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -24444,16 +24775,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:24447: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:24778: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:24450: \$? = $ac_status" >&5
-+  echo "$as_me:24781: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:24453: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24784: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24456: \$? = $ac_status" >&5
-+  echo "$as_me:24787: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -24463,10 +24794,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:24466: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:24797: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:24469: checking size of wchar_t" >&5
-+echo "$as_me:24800: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -24475,7 +24806,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 24478 "configure"
-+#line 24809 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -24487,21 +24818,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:24490: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:24821: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:24493: \$? = $ac_status" >&5
-+  echo "$as_me:24824: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:24496: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24827: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24499: \$? = $ac_status" >&5
-+  echo "$as_me:24830: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 24504 "configure"
-+#line 24835 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -24513,16 +24844,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:24516: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:24847: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:24519: \$? = $ac_status" >&5
-+  echo "$as_me:24850: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24853: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24525: \$? = $ac_status" >&5
-+  echo "$as_me:24856: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -24538,7 +24869,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 24541 "configure"
-+#line 24872 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -24550,16 +24881,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:24553: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:24884: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:24556: \$? = $ac_status" >&5
-+  echo "$as_me:24887: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:24559: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24890: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24562: \$? = $ac_status" >&5
-+  echo "$as_me:24893: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -24575,7 +24906,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 24578 "configure"
-+#line 24909 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -24587,16 +24918,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:24590: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:24921: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:24593: \$? = $ac_status" >&5
-+  echo "$as_me:24924: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:24596: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24927: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24599: \$? = $ac_status" >&5
-+  echo "$as_me:24930: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -24609,12 +24940,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:24612: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:24943: 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 24617 "configure"
-+#line 24948 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -24630,15 +24961,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:24633: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:24964: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:24636: \$? = $ac_status" >&5
-+  echo "$as_me:24967: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:24638: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:24969: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:24641: \$? = $ac_status" >&5
-+  echo "$as_me:24972: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -24654,7 +24985,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:24657: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:24988: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <&5
-+echo "$as_me:25006: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -24714,7 +25045,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:24717: result: $LIB_SUBSETS" >&5
-+echo "$as_me:25048: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -24745,7 +25076,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:24748: checking default library suffix" >&5
-+echo "$as_me:25079: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -24756,10 +25087,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:24759: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:25090: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:24762: checking default library-dependency suffix" >&5
-+echo "$as_me:25093: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -24817,10 +25148,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:24820: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:25151: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:24823: checking default object directory" >&5
-+echo "$as_me:25154: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -24836,11 +25167,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:24839: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:25170: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:24843: checking c++ library-dependency suffix" >&5
-+echo "$as_me:25174: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -24908,7 +25239,7 @@
- 	fi
- 
- fi
--echo "$as_me:24911: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:25242: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -25084,19 +25415,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:25087: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:25418: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:25096: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:25427: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:25099: \$? = $ac_status" >&5
-+  echo "$as_me:25430: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -25107,10 +25438,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 25110 "configure"
-+#line 25441 "configure"
- #include "confdefs.h"
- 
--#line 25113 "configure"
-+#line 25444 "configure"
- #include 
- int cf_ldflags_static(FILE *fp);
- 
-@@ -25125,16 +25456,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:25128: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:25459: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:25131: \$? = $ac_status" >&5
-+  echo "$as_me:25462: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:25134: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:25465: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:25137: \$? = $ac_status" >&5
-+  echo "$as_me:25468: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -25157,7 +25488,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:25160: result: $cf_ldflags_static" >&5
-+	echo "$as_me:25491: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -25173,7 +25504,7 @@
- 	;;
- esac
- 
--echo "$as_me:25176: checking where we will install curses.h" >&5
-+echo "$as_me:25507: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -25183,7 +25514,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:25186: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:25517: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -25191,7 +25522,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:25194: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:25525: 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
-@@ -25209,7 +25540,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:25212: checking for src modules" >&5
-+echo "$as_me:25543: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -25274,7 +25605,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:25277: result: $cf_cv_src_modules" >&5
-+echo "$as_me:25608: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -25509,53 +25840,6 @@
- SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
- fi
- 
--# Extract the first word of "tic", so it can be a program name with args.
--set dummy tic; ac_word=$2
--echo "$as_me:25514: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_TIC_PATH+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $TIC_PATH in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_TIC_PATH="$TIC_PATH" # Let the user override the test with a path.
--  ;;
--  *)
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH:/usr/local/ncurses/bin"
--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_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:25531: found $ac_dir/$ac_word" >&5
--   break
--fi
--done
--
--  test -z "$ac_cv_path_TIC_PATH" && ac_cv_path_TIC_PATH="unknown"
--  ;;
--esac
--fi
--TIC_PATH=$ac_cv_path_TIC_PATH
--
--if test -n "$TIC_PATH"; then
--  echo "$as_me:25543: result: $TIC_PATH" >&5
--echo "${ECHO_T}$TIC_PATH" >&6
--else
--  echo "$as_me:25546: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--if test -n "$FALLBACK_LIST"
--then
--	if test "$TIC_PATH" = unknown
--	then
--		{ echo "$as_me:25554: WARNING: no tic program found for fallbacks" >&5
--echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
--	fi
--fi
--
- if test "x$cf_with_tests" != xno ; then
- 	MAKE_TESTS=
- else
-@@ -25587,7 +25871,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:25590: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:25874: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -25598,7 +25882,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:25601: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:25885: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -25614,7 +25898,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:25617: result: $PKG_CFLAGS" >&5
-+echo "$as_me:25901: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -25677,7 +25961,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:25680: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:25964: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -25787,7 +26071,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:25790: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:26074: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -25963,7 +26247,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:25966: error: ambiguous option: $1
-+    { { echo "$as_me:26250: 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;}
-@@ -25982,7 +26266,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:25985: error: unrecognized option: $1
-+  -*) { { echo "$as_me:26269: 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;}
-@@ -26102,7 +26386,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:26105: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:26389: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -26313,6 +26597,8 @@
- s,@NCURSES_USE_DATABASE@,$NCURSES_USE_DATABASE,;t t
- s,@FALLBACK_LIST@,$FALLBACK_LIST,;t t
- s,@USE_FALLBACKS@,$USE_FALLBACKS,;t t
-+s,@TIC@,$TIC,;t t
-+s,@INFOCMP@,$INFOCMP,;t t
- s,@WHICH_XTERM@,$WHICH_XTERM,;t t
- s,@XTERM_KBS@,$XTERM_KBS,;t t
- s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
-@@ -26448,7 +26734,6 @@
- s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
- s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t
- s,@cross_compiling@,$cross_compiling,;t t
--s,@TIC_PATH@,$TIC_PATH,;t t
- s,@MAKE_TESTS@,$MAKE_TESTS,;t t
- s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
- s,@PANEL_NAME@,$PANEL_NAME,;t t
-@@ -26596,7 +26881,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:26599: creating $ac_file" >&5
-+    { echo "$as_me:26884: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -26614,7 +26899,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:26617: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:26902: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -26627,7 +26912,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:26630: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:26915: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -26643,7 +26928,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:26646: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:26931: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -26652,7 +26937,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:26655: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:26940: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -26689,7 +26974,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:26692: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:26977: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -26700,7 +26985,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:26703: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:26988: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -26749,7 +27034,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:26752: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:27037: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -26760,7 +27045,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:26763: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:27048: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -26773,7 +27058,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:26776: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:27061: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -26831,7 +27116,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:26834: $ac_file is unchanged" >&5
-+      { echo "$as_me:27119: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -27176,7 +27461,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:27179: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:27464: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: configure.in
-Prereq:  1.682 
---- ncurses-6.1-20190623+/configure.in	2019-06-23 21:26:48.000000000 +0000
-+++ ncurses-6.1-20190630/configure.in	2019-06-30 15:21:02.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.682 2019/06/23 21:26:48 tom Exp $
-+dnl $Id: configure.in,v 1.688 2019/06/30 15:21:02 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See https://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20170501)
--AC_REVISION($Revision: 1.682 $)
-+AC_REVISION($Revision: 1.688 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -629,6 +629,22 @@
- AC_SUBST(FALLBACK_LIST)
- AC_SUBST(USE_FALLBACKS)
- 
-+# The fallback feature in ncurses relies upon tic/infocmp outside the build
-+# tree for generating the terminal descriptions that will be compiled into the
-+# library.  If your toolchain is old, it may not handle current terminal
-+# databases.  Use configure-options to point to the tools which will be used,
-+# rather than the first ones found on the $PATH.
-+if test -n "$FALLBACK_LIST"
-+then
-+	CF_WITH_PATH_PROG(TIC,     tic,     [for fallbacks], $PATH:/usr/local/ncurses/bin)
-+	CF_WITH_PATH_PROG(INFOCMP, infocmp, [for fallbacks], $PATH:/usr/local/ncurses/bin)
-+else
-+	: ${TIC:=tic}
-+	: ${INFOCMP:=infocmp}
-+fi
-+AC_SUBST(TIC)
-+AC_SUBST(INFOCMP)
-+
- AC_MSG_CHECKING(if you want modern xterm or antique)
- AC_ARG_WITH(xterm-new,
- 	[  --without-xterm-new     specify if xterm terminfo should be old version],
-@@ -2221,16 +2237,6 @@
- fi
- AC_SUBST(cross_compiling)
- 
--AC_PATH_PROG(TIC_PATH,tic,unknown,$PATH:/usr/local/ncurses/bin)
--if test -n "$FALLBACK_LIST"
--then
--	if test "$TIC_PATH" = unknown
--	then
--		AC_MSG_WARN(no tic program found for fallbacks)
--	fi
--fi
--AC_SUBST(TIC_PATH)
--
- if test "x$cf_with_tests" != xno ; then
- 	MAKE_TESTS=
- else
-Index: dist.mk
-Prereq:  1.1290 
---- ncurses-6.1-20190623+/dist.mk	2019-06-23 15:31:40.000000000 +0000
-+++ ncurses-6.1-20190630/dist.mk	2019-06-30 01:30:19.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1290 2019/06/23 15:31:40 tom Exp $
-+# $Id: dist.mk,v 1.1292 2019/06/30 01:30:19 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20190623
-+NCURSES_PATCH = 20190630
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: misc/run_tic.in
-Prereq:  1.35 
---- ncurses-6.1-20190623+/misc/run_tic.in	2017-10-24 00:16:22.000000000 +0000
-+++ ncurses-6.1-20190630/misc/run_tic.in	2019-06-30 16:29:23.000000000 +0000
-@@ -1,7 +1,7 @@
- #!@SHELL@
--# $Id: run_tic.in,v 1.35 2017/10/24 00:16:22 tom Exp $
-+# $Id: run_tic.in,v 1.36 2019/06/30 16:29:23 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2012,2017 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2017,2019 Free 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"), #
-@@ -50,7 +50,7 @@
- : ${srcdir:=@srcdir@}
- : ${datarootdir:=@datarootdir@}
- : ${datadir:=@datadir@}
--: ${TIC_PATH:=@TIC_PATH@}
-+: ${TIC_PATH:=@TIC@}
- : ${ticdir:=@TERMINFO@}
- : ${source:=@TERMINFO_SRC@}
- : ${LN_S:="@LN_S@"}
-Index: misc/terminfo.src
---- ncurses-6.1-20190623+/misc/terminfo.src	2019-06-09 20:01:43.000000000 +0000
-+++ ncurses-6.1-20190630/misc/terminfo.src	2019-06-30 20:05:21.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.742 $
--#	$Date: 2019/06/09 20:01:43 $
-+#	$Revision: 1.749 $
-+#	$Date: 2019/06/30 20:05:21 $
- #
- # 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
-@@ -495,9 +495,8 @@
- 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A,
- 	dch=\E[%p1%dP, dispc=\E=%p1%dg, ech=\E[%p1%dX,
- 	hpa=\E[%i%p1%dG, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
--	il=\E[%p1%dL, indn=\E[%p1%dS, rc=\E7, rin=\E[%p1%dT,
--	rmam=\E[?7l, sc=\E7, smam=\E[?7h, tbc=\E[g,
--	vpa=\E[%i%p1%dd,
-+	il=\E[%p1%dL, rc=\E7, rmam=\E[?7l, sc=\E7, smam=\E[?7h,
-+	tbc=\E[g, vpa=\E[%i%p1%dd, use=ecma+index,
- 
- #### ANSI/ECMA-48 terminals and terminal emulators
- #
-@@ -612,12 +611,11 @@
- 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
- 	cuu=\E[%p1%dA, dch=\E[%p1%dP, dl=\E[%p1%dM,
- 	ech=\E[%p1%dX, el1=\E[1K, hpa=\E[%i%p1%dG, ht=\E[I,
--	ich=\E[%p1%d@, il=\E[%p1%dL, indn=\E[%p1%dS, kbs=^H,
--	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[3g,
--	vpa=\E[%i%p1%dd, use=pcansi-m,
-+	ich=\E[%p1%d@, il=\E[%p1%dL, kbs=^H, 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,
-+	s0ds=\E(B, s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[3g,
-+	vpa=\E[%i%p1%dd, use=ecma+index, use=pcansi-m,
- 
- ansi+enq|ncurses extension for ANSI ENQ,
- 	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?%[;0123456789]c,
-@@ -1195,10 +1193,10 @@
- 	     \263y\363z\362{\343|\330}\234~\376,
- 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
- 	el1=\E[1K, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@,
--	indn=\E[%p1%dS, invis=\E[8m, nel=\EE, rin=\E[%p1%dT,
-+	invis=\E[8m, nel=\EE,
- 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
- 	    2%;%?%p6%t;1%;%?%p7%t;8%;m,
--	use=mach,
-+	use=ecma+index, use=mach,
- 
- mach-gnu-color|Mach Console with ANSI color,
- 	colors#8, pairs#64,
-@@ -1245,24 +1243,23 @@
- 	dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M,
- 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\Eg,
- 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
--	il=\E[%p1%dL, il1=\E[L, ind=\E[S, indn=\E[%p1%dS,
--	invis=\E[8m, kb2=\E[G, kbs=^?, kcbt=\E[Z, kcub1=\EOD,
--	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~,
--	kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
--	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
--	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
--	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
--	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-+	il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m, kb2=\E[G,
-+	kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-+	kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
-+	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-+	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-+	kf19=\E[33~, kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS,
-+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
- 	khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
- 	kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\E[T,
--	rin=\E[%p1%dT, rmacs=\E[10m, rmir=\E[4l, rmso=\E[27m,
--	rmul=\E[24m, rs1=\EM\E[?1000l, sc=\E7, setab=\E[4%p1%dm,
-+	rmacs=\E[10m, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
-+	rs1=\EM\E[?1000l, sc=\E7, setab=\E[4%p1%dm,
- 	setaf=\E[3%p1%dm,
- 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
- 	    2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
- 	sgr0=\E[0m, smacs=\E[11m, smir=\E[4h, smso=\E[7m,
- 	smul=\E[4m, vpa=\E[%i%p1%dd, grbom=\E[>1l, gsbom=\E[>1h,
--	use=ecma+italics,
-+	use=ecma+index, use=ecma+italics,
- 
- #### QNX
- #
-@@ -1377,7 +1374,7 @@
- 	el=\E[K, el1=\E[1K\E[X, flash=\E[?5h$<200>\E[?5l,
- 	fsl=\E[?6h\E8, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
- 	ich=\E[%p1%d@, ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L,
--	ind=\E[S, indn=\E[%p1%dS, invis=\E[9m,
-+	ind=\E[S, invis=\E[9m,
- 	is2=\E>\E[?1l\E[?7h\E[0;10;39;49m, is3=\E(B\E)0,
- 	kBEG=\ENn, kCAN=\E[s, kCMD=\E[t, kCPY=\ENs, kCRT=\ENt,
- 	kDL=\ENv, kEXT=\ENw, kFND=\ENx, kHLP=\ENy, kHOM=\E[h,
-@@ -1401,9 +1398,9 @@
- 	kopt=\ENk, kpp=\E[V, kref=\ENl, kres=\ENp, krfr=\ENg,
- 	kri=\E[b, krpl=\ENr, krst=\ENj, ksav=\ENq, kslt=\E[T,
- 	ktbc=\ENd, kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m,
--	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\E[T,
--	rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmso=\E[27m,
--	rmul=\E[24m, rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
-+	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\E[T, rmacs=^O,
-+	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
-+	rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
- 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
- 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
- 	     %=%t3%e%p1%d%;m,
-@@ -1413,7 +1410,7 @@
- 	    %|%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[3g,
--	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
-+	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ecma+index,
- #
- qansi|QNX ansi with console writes,
- 	daisy, xhpa, use=qansi-g,
-@@ -1475,23 +1472,23 @@
- 	dch1=\E[P, dispc=\E[=%p1%dg, dl=\E[%p1%dM, dl1=\E[M,
- 	ed=\E[m\E[J, el=\E[m\E[K, el1=\E[1K, home=\E[H, ht=^I,
- 	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
--	ind=\E[S, indn=\E[%p1%dS, invis=\E[8m, kbeg=\E[E, kbs=^H,
--	kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
--	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
--	kf12=\E[X, kf13=\E[Y, kf15=\E[a, kf16=\E[b, kf17=\E[c,
--	kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g,
--	kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l,
--	kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p,
--	kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u,
--	kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P,
--	kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[],
--	kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q,
--	kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H,
--	kich1=\E[L, knp=\E[G, kpp=\E[I, op=\E[0;37;40m, rc=\E8,
--	rev=\E[7m, ri=\E[T, rin=\E[%p1%dT, rmacs=\E[10m,
--	rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sc=\E7,
--	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0;10m,
--	smacs=\E[12m, smam=\E[?7h, smso=\E[7m, smul=\E[4m,
-+	ind=\E[S, invis=\E[8m, kbeg=\E[E, kbs=^H, kcbt=\E[Z,
-+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?,
-+	kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X,
-+	kf13=\E[Y, kf15=\E[a, kf16=\E[b, kf17=\E[c, kf18=\E[d,
-+	kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g, kf22=\E[h,
-+	kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l, kf27=\E[m,
-+	kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p, kf31=\E[q,
-+	kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u, kf36=\E[v,
-+	kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P, kf40=\E[z,
-+	kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[], kf45=\E[\^,
-+	kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q, kf6=\E[R,
-+	kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, kich1=\E[L,
-+	knp=\E[G, kpp=\E[I, op=\E[0;37;40m, rc=\E8, rev=\E[7m,
-+	ri=\E[T, rmacs=\E[10m, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
-+	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-+	sgr0=\E[0;10m, smacs=\E[12m, smam=\E[?7h, smso=\E[7m,
-+	smul=\E[4m, use=ecma+index,
- scoansi-new|SCO Extended ANSI standard crt (5.0.6),
- 	km,
- 	civis=\E[=0c, cnorm=\E[=1c, csr=\E[%i%p1%d;%p2%dr,
-@@ -1674,18 +1671,19 @@
- 	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, hts=\EH, ich=\E[%p1%d@,
--	il=\E[%p1%dL, il1=\E[L, ind=\ED, indn=\E[%p1%dS,
-+	il=\E[%p1%dL, il1=\E[L, ind=\ED,
- 	is1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kbs=^?,
- 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
- 	kdch1=\E[3~, kf1=\E[17~, kf2=\E[18~, kf3=\E[19~,
- 	kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~,
- 	khome=\E[1~, kich1=\E[2~, kll=\E[4~, knp=\E[6~, kpp=\E[5~,
- 	nel=\EE, rc=\E8, rev=\E[7m, rf=/usr/share/tabset/vt100,
--	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
-+	ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
- 	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
- 	rs1=\Ec\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
- 	sgr0=\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
- 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-+	use=ecma+index,
- 
- #	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
- #	termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and
-@@ -1890,15 +1888,15 @@
- 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, dl=\E[%p1%dM,
- 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
- 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
--	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
--	indn=\E[%p1%dS, kb2=\E[E, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
--	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[F,
--	kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X, kf2=\E[N,
--	kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T,
--	kf9=\E[U, khome=\E[H, kich1=\E[L, knp=\E[G, kpp=\E[I,
--	nel=\E[E, op=\E[x, rc=\E8, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT,
--	rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7, setb=\E[4%p1%dm,
--	setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
-+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kb2=\E[E,
-+	kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-+	kcuu1=\E[A, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V,
-+	kf11=\E[W, kf12=\E[X, kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q,
-+	kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H,
-+	kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8,
-+	rev=\E[7m, ri=\E[T, rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7,
-+	setb=\E[4%p1%dm, setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m,
-+	vpa=\E[%i%p1%dd, use=ecma+index,
- 
- #### FreeBSD console entries
- #
-@@ -1939,25 +1937,25 @@
- 	cvvis=\E[=1C, dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m,
- 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
- 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
--	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
--	indn=\E[%p1%dS, kb2=\E[E, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
--	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[F,
--	kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X, kf13=\E[Y,
--	kf14=\E[Z, kf15=\E[a, kf16=\E[b, kf17=\E[c, kf18=\E[d,
--	kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g, kf22=\E[h,
--	kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l, kf27=\E[m,
--	kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p, kf31=\E[q,
--	kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u, kf36=\E[v,
--	kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P, kf40=\E[z,
--	kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[], kf45=\E[\^,
--	kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q, kf6=\E[R,
--	kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, kich1=\E[L,
--	knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8, rev=\E[7m,
--	ri=\E[T, rin=\E[%p1%dT, rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7,
--	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kb2=\E[E,
-+	kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-+	kcuu1=\E[A, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V,
-+	kf11=\E[W, kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a,
-+	kf16=\E[b, kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N,
-+	kf20=\E[f, kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j,
-+	kf25=\E[k, kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o,
-+	kf3=\E[O, kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s,
-+	kf34=\E[t, kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x,
-+	kf39=\E[y, kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[,
-+	kf43=\E[\\, kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`,
-+	kf48=\E[{, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U,
-+	khome=\E[H, kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E,
-+	op=\E[x, rc=\E8, rev=\E[7m, ri=\E[T, rmso=\E[m,
-+	rs2=\E[x\E[m\Ec, sc=\E7, setab=\E[4%p1%dm,
-+	setaf=\E[3%p1%dm,
- 	sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;30;1%;%?
- 	    %p6%t;1%;m,
--	sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
-+	sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd, use=ecma+index,
- cons25|ansis|ansi80x25|freebsd console (25-line ansi mode),
- 	acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l
- 	     \332m\300n\305q\304t\303u\264v\301w\302x\263y\363z\362~
-@@ -3537,14 +3535,14 @@
- # 2018/01/21: found xterm+sm+1006 did not work with version 3.1.5
- # 2018/05/19: xterm+sm+1006 seems to work with 3.1.6beta -TD
- iTerm2.app|iterm2|terminal emulator for Mac OS X,
--	blink=\E[5m, cbt=\E[Z, dim=\E[2m, indn=\E[%p1%dS,
--	kEND=\E[1;2F, kHOM=\E[1;2H, ka1@, ka3@, kb2@, kc1@, kc3@, kent@,
--	kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S,
--	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
--	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
--	kf23=\E[23;2~, kf24=\E[24;2~, kind=\E[1;2B, kri=\E[1;2A,
--	nel=\EE, op=\E[39;49m, rin=\E[%p1%dT, rmso=\E[27m,
--	rmul=\E[24m, rs2=\E[!p\E[?3;4l\E[4l\E>\E[?1000l,
-+	blink=\E[5m, cbt=\E[Z, dim=\E[2m, kEND=\E[1;2F,
-+	kHOM=\E[1;2H, ka1@, ka3@, kb2@, kc1@, kc3@, kent@, kf13=\E[1;2P,
-+	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~,
-+	kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~,
-+	kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~,
-+	kf24=\E[24;2~, kind=\E[1;2B, kri=\E[1;2A, nel=\EE,
-+	op=\E[39;49m, rmso=\E[27m, rmul=\E[24m,
-+	rs2=\E[!p\E[?3;4l\E[4l\E>\E[?1000l,
- 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
- 	    %p5%t;2%;m%?%p9%t\016%e\017%;,
- 	kDN3=\E\E[B, kDN4=\E[1;10B, kDN5=\E[1;5B, kDN6=\E[1;6B,
-@@ -3555,8 +3553,8 @@
- 	kLFT5=\E[1;5D, kLFT6=\E[1;6D, kNXT3=\E\E[6~,
- 	kPRV3=\E\E[5~, kRIT3=\E\E[C, kRIT4=\E[1;10C,
- 	kRIT5=\E[1;5C, kRIT6=\E[1;6C, kUP3=\E\E[A, kUP4=\E[1;10A,
--	kUP5=\E[1;5A, kUP6=\E[1;6A, use=xterm+alt+title,
--	use=ecma+italics, use=iterm,
-+	kUP5=\E[1;5A, kUP6=\E[1;6A, use=ecma+index,
-+	use=xterm+alt+title, use=ecma+italics, use=iterm,
- 
- # xnuppc - Darwin PowerPC Console (a.k.a. "darwin")
- #
-@@ -3882,7 +3880,7 @@
- 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
- 	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l,
- 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL,
--	il1=\E[L, ind=\n, indn=\E[%p1%dS,
-+	il1=\E[L, ind=\n,
- 	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/
- 	      %02x%p4%{255}%*%{1000}%/%02x,
- 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
-@@ -3890,10 +3888,9 @@
- 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
- 	kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~,
- 	kind=\E[B, knp=\E[6~, kpp=\E[5~, kri=\E[A, kspd=^Z, nel=\r\n,
--	oc=\E]R, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
--	rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l,
--	rmir=\E[4l, rmkx=\E[?1l\E>, rmpch=\E[10m, rmso=\E[27m,
--	rmul=\E[24m,
-+	oc=\E]R, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
-+	rmam=\E[?7l, rmcup=\E[2J\E[?47l, rmir=\E[4l,
-+	rmkx=\E[?1l\E>, rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m,
- 	rs2=\E<\E["p\E[50;6"p\Ec\E[?3l\E]R\E[?1000l,
- 	s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m, sc=\E7,
- 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-@@ -3902,8 +3899,8 @@
- 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[?47h,
- 	smir=\E[4h, smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m,
- 	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3J,
--	use=xterm+sm+1006, use=putty+fnkeys, use=vt102+enq,
--	use=xterm+sl,
-+	use=ecma+index, use=xterm+sm+1006, use=putty+fnkeys,
-+	use=vt102+enq, use=xterm+sl,
- vt100-putty|Reset PuTTY to pure vt100,
- 	rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p,
- 	use=vt100,
-@@ -4160,6 +4157,8 @@
- teraterm|Tera Term,
- 	use=teraterm4.97,
- 
-+#### Command prompt
-+
- # Tested with WinNT 4.0, the telnet application assumes the screensize is
- # 25x80.  This entry uses the 'Terminal' font, to get line-drawing characters.
- #
-@@ -4224,6 +4223,79 @@
- ms-vt-utf8|vt-utf8|UTF-8 flavor of vt100+,
- 	use=ms-vt100+,
- 
-+# Windows 10 1903
-+# Version 0.2.1715.0
-+# The task manager shows this as "OpenConsole.exe", which differs
-+# from the "Windows Command Processor" used for the command-prompt.
-+#
-+# The settings dialog does not work (unless the end user expects to open
-+# profiles.json in Visual Studio).  There is no documentation, of course.
-+#
-+# Testing via an ssh connection, using openssh:
-+# - the program sets TERM to cygwin if the tab is set to PowerShell,
-+#   and to xterm-256color if "Legacy".  However, in the latter, more tests
-+#   fail in vttest, which does not pay attention to TERM.
-+# vttest:
-+# - menu 1 (tests for cursor movement) misbehaves like command-prompt
-+# - does not flush response to primary DA, leaving a ^M on the end when
-+#   The PowerShell tab is used.  Both the "Legacy" tab and the command-prompt
-+#   work properly in this test.
-+# - in the generic VT100 tests, there are problems with character sets.
-+# - outside of the generic VT100 tests, the program does poorly because most
-+#   of the features are missing.
-+# - ECH does not work properly
-+# - a few generic xterm features are supported (set window title), but
-+#   others are missing (such as the mouse).
-+# - the cursor visible/invisible works in the PowerShell tab, not in "Legacy"
-+# tack: 
-+# - blink, dim, bold, invis, protect do not work
-+# - bce works (but per vttest, with ED, EL, not BCE)
-+# - does not support keypad application mode
-+# - implements most of the xterm modified keys; sometimes modifiers are ignored
-+#   or simply incorrect
-+# - sends escape+key rather than implementing meta mode
-+# other:
-+# - color palette cannot be altered
-+ms-terminal|Windows10 terminal,
-+	npc,
-+	rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@, use=xterm+256setaf,
-+	use=xterm+pcfkeys, use=xterm-basic,
-+
-+#### Visual Studio
-+# Visual Studio Code 1.35.1
-+#
-+# This sets TERM to xterm-256color, which is a little more successful than
-+# Windows Terminal.
-+#
-+# vttest:
-+# - menu 1 (cursor movement) has problems with wrapping
-+# - claims to be a VT100 with AVO, but copies xterm #276's secondary response
-+# - menu 8 (insert/delete char/line) has problem with delete-character
-+# - like Windows Terminal, fails the ECH test: neither supports DECALN
-+#   However, the bce test with ECH works.
-+# - does not support keypad application mode
-+# - supports most xterm mode controls (except DEC Locator Events)
-+# - REP, SL/SL do not work, but SD/SU work.
-+# - the alternate-screen tests fail because it does not support DECALN
-+# - window modify/report is not supported
-+# - supports some VT320 presentation reports
-+# tack:
-+# - does not support blinking text
-+# - implements most of the xterm modified keys, with some exceptions:
-+#   - pageup/pagedown do not send escapes
-+#   - alt cursor left/right send escape-b and escape-f
-+# - sends UTF-8 like xterm for meta mode
-+# other:
-+# - mouse mode is not reset by reset-sequence
-+# - supports italics and dim, but not cross-out or double-underline
-+# - color-palette cannot be changed
-+vscode|Visual Studio Code terminal,
-+	npc,
-+	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=xterm+256setaf,
-+	use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys,
-+	use=xterm-basic, use=xterm-basic,
-+vscode-direct|Visual Studio Code with direct-colors,
-+	use=xterm+indirect, use=vscode,
- 
- ######## X TERMINAL EMULATORS
- #### XTERM
-@@ -4392,10 +4464,10 @@
- 	kf38=\EO6Q, kf39=\EO6R, kf40=\EO6S, kf41=\E[15;6~,
- 	kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~,
- 	kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~,
--	kf48=\E[24;6~, khome=\EOH, rmcup=\E[?1049l,
-+	kf48=\E[24;6~, khome=\EOH,
- 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
- 	    %p9%t\016%e\017%;,
--	smcup=\E[?1049h, use=xterm-xf86-v333,
-+	use=xterm+alt1049, use=xterm-xf86-v333,
- 
- # This version was released in XFree86 4.3.
- xterm-xf86-v43|xterm terminal emulator (XFree86 4.3 Window System),
-@@ -4408,8 +4480,8 @@
- 
- # This version was released in XFree86 4.4.
- xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
--	cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h, indn=\E[%p1%dS,
--	rin=\E[%p1%dT, use=xterm-xf86-v43,
-+	cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h, use=ecma+index,
-+	use=xterm-xf86-v43,
- 
- xterm-xfree86|xterm terminal emulator (XFree86),
- 	use=xterm-xf86-v44,
-@@ -4417,10 +4489,10 @@
- # This version reflects the current xterm features.
- xterm-new|modern xterm terminal emulator,
- 	npc,
--	indn=\E[%p1%dS, kcbt=\E[Z, kent=\EOM, rin=\E[%p1%dT,
--	use=ansi+rep, use=ecma+strikeout, use=xterm+keypad,
--	use=vt420+lrmm, use=xterm+sm+1006, use=xterm+pcfkeys,
--	use=xterm+tmux, use=xterm-basic,
-+	kcbt=\E[Z, kent=\EOM, use=ecma+index, use=ansi+rep,
-+	use=ecma+strikeout, use=xterm+keypad, use=vt420+lrmm,
-+	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
-+	use=xterm-basic,
- 
- # This fragment is for people who cannot agree on what the backspace key
- # should send.
-@@ -5472,7 +5544,7 @@
- vte-2014|VTE 0.35.1,
- 	ncv@,
- 	cbt=\E[Z, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
--	ich=\E[%p1%d@, indn=\E[%p1%dS, kent=\EOM, rin=\E[%p1%dT,
-+	ich=\E[%p1%d@, kent=\EOM, use=ecma+index,
- 	use=xterm+sm+1006, use=xterm+pcfkeys, use=vte-2012,
- 
- # As of January 2018, this was the  most recent release,
-@@ -5536,19 +5608,19 @@
- 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
- 	dch=\E[%p1%dP, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
- 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
--	ht=^I, hts=\EH, ind=\n, indn=\E[%p1%dS, invis=\E[8m,
-+	ht=^I, hts=\EH, ind=\n, invis=\E[8m,
- 	is2=\E[!p\E[?3;4l\E[4l\E>, kb2=\EOE, kbs=^?, kcbt=\E[Z,
--	kent=\EOM, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM,
--	rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l,
--	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
--	rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
-+	kent=\EOM, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B,
-+	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
-+	rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
- 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
- 	    %t;7%;%?%p7%t;8%;m,
--	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
--	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
--	vpa=\E[%i%p1%dd, use=ansi+idc, use=ansi+idl,
--	use=ansi+enq, use=ecma+italics, use=xterm+256color,
--	use=ecma+color, use=xterm+pcfkeys, use=xterm+sl-twm,
-+	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
-+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
-+	use=xterm+alt1049, use=ecma+index, use=ansi+idc,
-+	use=ansi+idl, use=ansi+enq, use=ecma+italics,
-+	use=xterm+256color, use=ecma+color, use=xterm+pcfkeys,
-+	use=xterm+sl-twm,
- 
- #### Other GNOME
- # Multi-Gnome-Terminal 1.6.2
-@@ -5556,7 +5628,7 @@
- # This does not use VTE, and does have different behavior (compare xfce and
- # gnome).
- mgt|Multi GNOME Terminal,
--	indn=\E[%p1%dS, rin=\E[%p1%dT, use=xterm-xf86-v333,
-+	use=ecma+index, use=xterm-xf86-v333,
- 
- #### KDE
- # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
-@@ -5620,16 +5692,16 @@
- 	ncv@,
- 	bel@, blink=\E[5m, civis=\E[?25l, cnorm=\E[?25h, dim=\E[2m,
- 	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l,
--	hpa=\E[%i%p1%dG, indn=\E[%p1%dS, invis=\E[8m, kbs=^?,
--	kdch1=\E[3~, kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@,
--	kf15@, kf16@, kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@,
--	kf7@, kf8@, kf9@, kfnd@, khome=\E[1~, kslt@, rin=\E[%p1%dT,
--	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
-+	hpa=\E[%i%p1%dG, invis=\E[8m, kbs=^?, kdch1=\E[3~,
-+	kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@, kf15@, kf16@,
-+	kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@,
-+	kf9@, kfnd@, khome=\E[1~, kslt@, rmam=\E[?7l, rmso=\E[27m,
-+	rmul=\E[24m, rs1=\Ec,
- 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
- 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
- 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd,
--	use=xterm+sm+1006, use=ecma+strikeout,
-+	use=ecma+index, use=xterm+sm+1006, use=ecma+strikeout,
- 	use=ecma+italics, use=ecma+color, use=xterm-r6,
- 
- # The keytab feature was introduced in 0.9.12 (February 2000) with "linux" and
-@@ -5785,23 +5857,24 @@
- 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
- 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
- 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
--	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS,
-+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
- 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
- 	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
- 	kdch1=\E[3~, kend=\EOF, kent=\EOM, kfnd=\E[1~, khome=\EOH,
- 	kich1=\E[2~, kind=\EO1;2B, kmous=\E[M, knp=\E[6~,
- 	kpp=\E[5~, kri=\EO1;2A, kslt=\E[4~, mc0=\E[i, nel=\EE,
--	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rin=\E[%p1%dT,
--	rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l,
--	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
-+	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B,
-+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-+	rmul=\E[24m, rs1=\Ec,
- 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l,
- 	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
- 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
- 	    \E(B%;,
--	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
--	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
--	tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
--	vpa=\E[%i%p1%dd, use=mlterm+pcfkeys, use=xterm+r6f2,
-+	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
-+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-+	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
-+	vpa=\E[%i%p1%dd, use=xterm+alt1049, use=ecma+index,
-+	use=mlterm+pcfkeys, use=xterm+r6f2,
- 
- # The insert/delete/home/end keys do not respond to modifiers because mlterm
- # looks in its termcap to decide which string to send.  If it used terminfo
-@@ -6298,14 +6371,13 @@
- 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
- 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J,
- 	el=\E[K, home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=,
--	il=\E[%p1%dL, il1=\E[L, ind=\E[S, indn=\E[%p1%dS,
--	invis=\E[8m, is2=\E)0\017, kbs=^H, nel=\EE, rev=\E[7m,
--	ri=\E[T, rin=\E[%p1%dT, rmacs=^O, rmir=\E[4l, rmso=\E[27m,
--	rmul=\E[24m,
-+	il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m,
-+	is2=\E)0\017, kbs=^H, nel=\EE, rev=\E[7m, ri=\E[T, rmacs=^O,
-+	rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
- 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
- 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[7m,
--	smul=\E[4m, vpa=\E[%i%p1%dd,
-+	smul=\E[4m, vpa=\E[%i%p1%dd, use=ecma+index,
- # mterm normally sets $TERM to "mterm"
- mterm|mouse-sun|Der Mouse term,
- 	am, bw, mir,
-@@ -6329,23 +6401,22 @@
- 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
- 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, enacs=\E(B\E)0,
- 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=, il=\E[%p1%dL,
--	il1=\E[L, ind=\E[S, indn=\E[%p1%dS, invis=\E[8m,
--	is2=\E)0\E[r\017, kbs=^H, kcub1=\EOD, kcud1=\EOB,
--	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\E[11~,
--	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
--	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
--	kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~,
--	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
--	kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~,
--	kpp=\E[5~, kslt=\E[4~, nel=\EE, op=\E[0m, rc=\E8, rev=\E[7m,
--	ri=\E[T, rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
--	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, sc=\E7,
--	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-+	il1=\E[L, ind=\E[S, invis=\E[8m, is2=\E)0\E[r\017, kbs=^H,
-+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-+	kdch1=\E[3~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
-+	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
-+	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-+	kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~,
-+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-+	kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kslt=\E[4~,
-+	nel=\EE, op=\E[0m, rc=\E8, rev=\E[7m, ri=\E[T, rmacs=^O,
-+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-+	rmul=\E[24m, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
- 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
- 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
- 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, u6=\E[%i%d;%dR,
--	u7=\E[6n, vpa=\E[%i%p1%dd,
-+	u7=\E[6n, vpa=\E[%i%p1%dd, use=ecma+index,
- 
- #### VWM
- # http://vwm.sourceforge.net/
-@@ -6368,12 +6439,12 @@
- 	kf12=\E[23~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
- 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
- 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m, rmacs=\E[10m,
--	rmam=\E[?7l, rmcup=\E[?1049l, rs1=\E[H\E[J\E[m\Ec,
--	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-+	rmam=\E[?7l, rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
-+	setaf=\E[3%p1%dm,
- 	sgr=\E[0;10%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
- 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
--	sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h,
--	smcup=\E[?1049h, smso=\E[3m, smul=\E[4m,
-+	sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h, smso=\E[3m,
-+	smul=\E[4m, use=xterm+alt1049,
- 
- #### MGR
- #
-@@ -6480,16 +6551,16 @@
- 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
- 	enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, fsl=^G, home=\E[H,
- 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
--	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS,
--	invis=\E[8m, is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~,
--	kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D,
--	kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~,
--	ka3=\E[5~, kb2=\EOu, kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z,
--	kclr=\E[3;5~, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
--	kcuu1=\EOA, kdch1=\E[3~, kdl1=\E[3;2~, ked=\E[1;5F,
--	kel=\E[1;2F, kend=\E[4~, kent=\EOM, kf1=\EOP, kf10=\E[21~,
--	kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q,
--	kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~,
-+	il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m,
-+	is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F,
-+	kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~,
-+	kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~, ka3=\E[5~, kb2=\EOu,
-+	kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z, kclr=\E[3;5~,
-+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-+	kdch1=\E[3~, kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F,
-+	kend=\E[4~, kent=\EOM, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
-+	kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R,
-+	kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~,
- 	kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~,
- 	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~,
- 	kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S,
-@@ -6508,20 +6579,20 @@
- 	kil1=\E[2;5~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
- 	kpp=\E[5~, kri=\E[1;2A, krmir=\E[2;2~, mc0=\E[i, mc4=\E[4i,
- 	mc5=\E[5i, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
--	rmacs=\E(B, rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>,
--	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l,
--	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-+	rmacs=\E(B, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-+	rmul=\E[24m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l, sc=\E7,
-+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
- 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
- 	     %=%t3%e%p1%d%;m,
- 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
- 	     %=%t3%e%p1%d%;m,
- 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
- 	    %t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
--	sgr0=\E[0m, smacs=\E(0, smcup=\E[?1049h, smir=\E[4h,
--	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
--	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
--	vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q, use=xterm+sl,
--	use=ecma+italics,
-+	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=,
-+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR,
-+	u7=\E[6n, u8=\E[?1;2c, u9=\E[c, vpa=\E[%i%p1%dd, Se=\E[2 q,
-+	Ss=\E[%p1%d q, use=ecma+index, use=xterm+alt1049,
-+	use=xterm+sl, use=ecma+italics,
- #
- # st-0.1.1
- #
-@@ -6551,17 +6622,18 @@
- 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
- 	dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
- 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
--	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, kbs=^?,
--	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
--	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
--	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
--	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-+	il=\E[%p1%dL, il1=\E[L, ind=\n, kbs=^?, kcub1=\E[D,
-+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
-+	kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
-+	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
-+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
- 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, op=\E[37;40m, rc=\E8,
- 	rev=\E[7m, rmacs=\E(B, rmso=\E[m, rmul=\E[m, sc=\E7,
- 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
- 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
- 	    %t;7%;m,
- 	sgr0=\E[0m, smacs=\E(0, smso=\E[7m, smul=\E[4m,
-+	use=ecma+index,
- st-16color|stterm-16color|simpleterm with 16-colors,
- 	use=ibm+16color, use=st,
- # 256 colors "works", but when running xterm's test-scripts, some garbage is
-@@ -6645,9 +6717,10 @@
- #	CBT, CHT, HPR, CNL,CPL, VPR do not work
- #
- # removed the cancel for "hs", removed cbt, invis, corrected sgr -TD
-+# use xterm+256setaf, etc -TD
- terminator|Terminator no line wrap,
- 	bce, eo, mir, msgr, xenl, xon,
--	colors#0x100, cols#80, it#8, lines#24, lm#0, pairs#0x10000,
-+	cols#80, it#8, lines#24, lm#0,
- 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- 	bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J,
- 	cnorm=\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-@@ -6657,24 +6730,23 @@
- 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
- 	el1=\E[1K, enacs=\E(B\E)0, flash=^G, home=\E[H,
- 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
--	ind=\n, indn=\E[%p1%dS, is1=\E[?47l\E=\E[?1l,
-+	ind=\n, is1=\E[?47l\E=\E[?1l,
- 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^?,
- 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
- 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
- 	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
- 	kf15=\E[28~, kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
- 	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
--	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
--	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rin=\E[%p1%dT,
--	ritm=\E[23m, rmacs=\E(B, rmcup=\E[?1049l, rmir=\E[4l,
--	rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
--	rs2=\E[!p\E[?3;4l\E[4l\E>, s0ds=\E(B, s1ds=\E(0, sc=\E7,
--	setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm,
-+	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, rc=\E8,
-+	rev=\E[7m, ri=\EM, rmacs=\E(B, rmir=\E[4l, rmso=\E[27m,
-+	rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
-+	s0ds=\E(B, s1ds=\E(0, sc=\E7,
- 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p1%p3%|%t;7
- 	    %;m%?%p9%t\E(0%e\E(B%;,
--	sgr0=\E[m\E(B, sitm=\E[3m, smacs=\E(0, smcup=\E[?1049h,
--	smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
--	tsl=\E]2;%p1, vpa=\E[%i%p1%dd, use=xterm+sl-twm,
-+	sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smso=\E[7m,
-+	smul=\E[4m, tbc=\E[3g, tsl=\E]2;%p1, vpa=\E[%i%p1%dd,
-+	use=ecma+italics, use=ecma+index, use=xterm+256setaf,
-+	use=xterm+sl-twm, use=xterm+alt1049,
- 
- #### TERMINOLOGY
- # https://www.enlightenment.org/about-terminology
-@@ -6819,8 +6891,8 @@
- # removed ecma+strikeout, not implemented -TD
- alacritty+common|base fragment for alacritty,
- 	npc,
--	ech@, indn=\E[%p1%dS, kb2=\EOE, kbs=^H, kcbt=\E[Z, kent=\EOM,
--	rin=\E[%p1%dT, Se=\E[0 q, use=xterm-basic, use=xterm+app,
-+	ech@, kb2=\EOE, kbs=^H, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
-+	use=ecma+index, use=xterm-basic, use=xterm+app,
- 	use=ansi+rep, use=xterm+sm+1006, use=xterm+tmux,
- 	use=ecma+italics, use=xterm+pce2, use=xterm+pcc2,
- 	use=xterm+pcf2,
-@@ -6917,28 +6989,28 @@
- 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
- 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
- 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
--	ind=\n, indn=\E[%p1%dS, kbs=^?, kcbt=\E[Z, kcub1=\EOD,
--	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\EOF,
--	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
--	kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S,
--	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
--	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
--	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q,
--	kf27=\E[1;5R, kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR,
--	kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~,
--	kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~,
--	kf36=\E[24;5~, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
--	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\EOH,
--	kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
--	kpp=\E[5~, kri=\E[1;2A, op=\E[39;49m, rc=\E8, rev=\E[7m,
--	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
-+	ind=\n, kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
-+	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\EOF, kf1=\EOP,
-+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P,
-+	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~,
-+	kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~,
-+	kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~,
-+	kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R,
-+	kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~,
-+	kf31=\E[18;5~, kf32=\E[19;5~, kf33=\E[20;5~,
-+	kf34=\E[21;5~, kf35=\E[23;5~, kf36=\E[24;5~, kf4=\EOS,
-+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-+	khome=\EOH, kich1=\E[2~, kind=\E[1;2B, kmous=\E[M,
-+	knp=\E[6~, kpp=\E[5~, kri=\E[1;2A, op=\E[39;49m, rc=\E8,
-+	rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
- 	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, sc=\E7,
- 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
- 	    %t;7%;;m,
- 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
- 	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
--	vpa=\E[%i%p1%dd, use=xterm+sl-twm, use=xterm+pce2,
--	use=xterm+pcc2, use=ecma+italics, use=xterm+alt1049,
-+	vpa=\E[%i%p1%dd, use=ecma+index, use=xterm+sl-twm,
-+	use=xterm+pce2, use=xterm+pcc2, use=ecma+italics,
-+	use=xterm+alt1049,
- 
- ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
- #
-@@ -7104,20 +7176,20 @@
- 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
- 	enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
- 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
--	ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z,
--	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
--	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
--	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
--	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
--	khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
--	nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
--	rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
-+	ind=\n, is2=\E)0, kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
-+	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP,
-+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR,
-+	kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-+	kf9=\E[20~, khome=\E[1~, kich1=\E[2~, kmous=\E[M,
-+	knp=\E[6~, kpp=\E[5~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
-+	rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
- 	rmul=\E[24m, rs2=\Ec\E[?1000l\E[?25h, sc=\E7,
- 	sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;
- 	    5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
--	sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h,
--	smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g,
--	vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c, use=ecma+color,
-+	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
-+	smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
-+	E0=\E(B, S0=\E(%p1%c, use=ecma+index, use=xterm+alt1049,
-+	use=ecma+color,
- # The bce and status-line entries are from screen 3.9.13 (and require some
- # changes to .screenrc).
- screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
-@@ -8307,18 +8379,18 @@
- 	cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
- 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
- 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
--	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
--	indn=\E[%p1%dS, invis=\E[8m, kbs=^H, kcub1=\E[D,
--	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
--	kend=\E[4~, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
--	kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
--	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m,
-+	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-+	kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, kf10=\E[21~,
-+	kf11=\E[23~, kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D,
-+	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
- 	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, nel=\r\n,
--	op=\E[37;40m, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT, rmso=\E[m,
-+	op=\E[37;40m, rev=\E[7m, ri=\E[T, rmso=\E[m,
- 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
- 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%e;25%;%?
- 	    %p6%t;1%;%?%p7%t;8%;m,
- 	sgr0=\E[m, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
-+	use=ecma+index,
- 
- djgpp203|Entry for DJGPP 2.03,
- 	OTbs, am,
-@@ -8336,14 +8408,14 @@
- 	cuu1=\E[A, cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P,
- 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
- 	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
--	il1=\E[L, ind=\E[S, indn=\E[%p1%dS, invis=\E[8m, kbs=^H,
--	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
--	kdch1=\E[3~, kf0=\E[21~, kf1=\E[[A, kf10=\E[21~, kf2=\E[[B,
--	kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
--	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
--	kll=\E[4~, knp=\E[6~, kpp=\E[5~, nel=\r\n, rev=\E[7m,
--	ri=\E[T, rin=\E[%p1%dT, rmso=\E[m, setab=\E[4%p1%dm,
--	setaf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
-+	il1=\E[L, ind=\E[S, invis=\E[8m, kbs=^H, kcub1=\E[D,
-+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
-+	kf0=\E[21~, kf1=\E[[A, kf10=\E[21~, kf2=\E[[B, kf3=\E[[C,
-+	kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-+	kf9=\E[20~, khome=\E[1~, kich1=\E[2~, kll=\E[4~, knp=\E[6~,
-+	kpp=\E[5~, nel=\r\n, rev=\E[7m, ri=\E[T, rmso=\E[m,
-+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m,
-+	smso=\E[7m, smul=\E[4m, use=ecma+index,
- 
- #### U/Win
- 
-@@ -8466,26 +8538,25 @@
- 	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA,
- 	cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
- 	home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
--	indn=\E[%p1%dS, kLFT=\EF\^, kRIT=\EF$, kbs=^H, kcbt=\E[Z,
--	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?,
--	kend=\E[U, kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB,
--	kf12=\EFC, kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG,
--	kf17=\EFH, kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK,
--	kf21=\EFL, kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP,
--	kf26=\EFQ, kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3,
--	kf30=\EFU, kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY,
--	kf35=\EFZ, kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd,
--	kf4=\EF4, kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh,
--	kf44=\EFi, kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn,
--	kf49=\EFo, kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr,
--	kf53=\EFs, kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw,
--	kf58=\EFx, kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7,
--	kf8=\EF8, kf9=\EF9, khome=\E[H, kich1=\E[L, kind=\EF+,
--	kll=\E[U, knp=\E[T, kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n,
--	op=\E[m, rc=\E[u, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT,
--	rmcup=\E[2b\E[u\r\E[K, rmso=\E[m, rmul=\E[m, rs1=\Ec,
--	sc=\E[s, sgr0=\E[0m, smcup=\E[s\E[1b, smso=\E[7m,
--	smul=\E[4m, use=klone+color,
-+	kLFT=\EF\^, kRIT=\EF$, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
-+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[U,
-+	kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB, kf12=\EFC,
-+	kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG, kf17=\EFH,
-+	kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK, kf21=\EFL,
-+	kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP, kf26=\EFQ,
-+	kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3, kf30=\EFU,
-+	kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY, kf35=\EFZ,
-+	kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd, kf4=\EF4,
-+	kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh, kf44=\EFi,
-+	kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn, kf49=\EFo,
-+	kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr, kf53=\EFs,
-+	kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw, kf58=\EFx,
-+	kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7, kf8=\EF8, kf9=\EF9,
-+	khome=\E[H, kich1=\E[L, kind=\EF+, kll=\E[U, knp=\E[T,
-+	kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n, op=\E[m, rc=\E[u,
-+	rev=\E[7m, ri=\E[T, rmcup=\E[2b\E[u\r\E[K, rmso=\E[m,
-+	rmul=\E[m, rs1=\Ec, sc=\E[s, sgr0=\E[0m, smcup=\E[s\E[1b,
-+	smso=\E[7m, smul=\E[4m, use=ecma+index, use=klone+color,
- 
- opennt-35|ntconsole-35|OpenNT-term35 compatible with color,
- 	lines#35, use=opennt,
-@@ -10852,8 +10923,7 @@
- 	dl=\E[%p1%dM, dl1=\ER, dsl=\E_30\r, ech=\E[%p1%d@, ed=\EY,
- 	el=\ET, flash=\Eb$<15>\Ed, fsl=\r, home=^^, ht=^I, hts=\E1,
- 	ich=\E[%p1%d@, if=/usr/share/tabset/stdcrt,
--	il=\E[%p1%dL, il1=\EE, ind=\n, indn=\E[%p1%dS, invis=\EG1,
--	ip=$<3>,
-+	il=\E[%p1%dL, il1=\EE, ind=\n, invis=\EG1, ip=$<3>,
- 	is1=\E"\E%\E'\E(\EG@\EO\EX\E[=5l\E[=6l\E[=7h\Ed\Er,
- 	is2=\EF2\EG0\E\\L, is3=\E<\E[=4l\E[=8h, kHOM=\E\s\s\s,
- 	kbs=^H, kcbt=\EI, kcub1=^H, kcud1=^V, kcuf1=^L, kcuu1=^K,
-@@ -10866,10 +10936,10 @@
- 	pfx=\E|%p1%{48}%+%c1%p2%s\031,
- 	pln=\E_%p1%{63}%+%c%p2%s\r, prot=\E&,
- 	rep=\E[%p2%db%p1%c, rev=\EG4,
--	rf=/usr/share/tabset/stdcrt, ri=\Ej, rin=\E[%p1%dT,
--	rmacs=\E%%, rmam=\E[=7l, rmcup=\E.3\Er\E[1;25r\E[25;0H,
--	rmdc=\0, rmir=\Er, rmln=\E[4;1v, rmso=\EG0, rmul=\EG0,
--	rmxon=^N, rs1=\EC\EDF\E[0;0v\E[8;1v\E[=65l,
-+	rf=/usr/share/tabset/stdcrt, ri=\Ej, rmacs=\E%%,
-+	rmam=\E[=7l, rmcup=\E.3\Er\E[1;25r\E[25;0H, rmdc=\0,
-+	rmir=\Er, rmln=\E[4;1v, rmso=\EG0, rmul=\EG0, rmxon=^N,
-+	rs1=\EC\EDF\E[0;0v\E[8;1v\E[=65l,
- 	rs2=\E.b\E[10;20v\E[14;1v\E[3;0v\E[7;0v\E[=11.h\E[=12.h\E[=1
- 	    3.h\E[=14.h\E[=15l\E[=20h\E[=60l\E[=61h\E[=9l\E[=10l\E[=
- 	    21l\E[=23l\E[=3l\E_40\E_50\En\Ew\Ee\s\Ex0\0\0\Ex1\0\0
-@@ -10881,7 +10951,7 @@
- 	    %p9%t\E$%e\E%%%;,
- 	sgr0=\EG0\E%, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er,
- 	smir=\Eq, smln=\E[4;2v, smso=\EGt, smul=\EG8, smxon=^O,
--	tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0,
-+	tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0, use=ecma+index,
- 
- #### Visual (vi)
- #
-@@ -13071,16 +13141,15 @@
- 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\EP,
- 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[0K, home=\E[H,
- 	hpa=\E[%p1%dG, ht=^I, hts=\E1, ich=\E[%p1%d@, ich1=\E\^,
--	il=\E[%p1%dL, il1=\EL, ind=\n, indn=\E[%p1%dS,
--	is1=\Ec\E[?7h, is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO,
--	kclr=\E[2J, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
--	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU,
--	kf7=\EOV, kf8=\EOW, khome=\E[H, kll=\E[24;1H, ll=\E[24H,
--	nel=\r\n, rc=\E8, rev=\E[7m, ri=\ET, rin=\E[%p1%dT,
--	rmacs=\E(B, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
--	rs2=\Ec\E[?3l\E[2;0y, sc=\E7, sgr0=\E[m\E(B, smacs=\E(0,
--	smam=\E[?7h, smso=\E[5m, smul=\E[4m, tbc=\E[3g,
--	vpa=\E[%p1%dd,
-+	il=\E[%p1%dL, il1=\EL, ind=\n, is1=\Ec\E[?7h,
-+	is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO, kclr=\E[2J, kcub1=\ED,
-+	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf1=\EOP, kf2=\EOQ,
-+	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
-+	khome=\E[H, kll=\E[24;1H, ll=\E[24H, nel=\r\n, rc=\E8,
-+	rev=\E[7m, ri=\ET, rmacs=\E(B, rmam=\E[?7l, rmso=\E[m,
-+	rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7, sgr0=\E[m\E(B,
-+	smacs=\E(0, smam=\E[?7h, smso=\E[5m, smul=\E[4m, tbc=\E[3g,
-+	vpa=\E[%p1%dd, use=ecma+index,
- 
- # Terminfo entry for the AT&T 510 A Personal Terminal
- # Function keys 9 - 16 are available only after the
-@@ -13136,24 +13205,24 @@
- 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[0J, el=\E[0K,
- 	el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H,
- 	hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
--	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS,
--	invis=\E[8m, is1=\E(B\E)1\E[5;0|, is3=\E[21;1|\212,
--	kLFT=\E[u, kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
--	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd,
--	kf11=\EOe, kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi,
--	kf16=\EOj, kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf,
--	kf7=\ENh, kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2,
--	mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, mgc=\E\:, nel=\EE,
-+	il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m,
-+	is1=\E(B\E)1\E[5;0|, is3=\E[21;1|\212, kLFT=\E[u,
-+	kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
-+	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe,
-+	kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi, kf16=\EOj,
-+	kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh,
-+	kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2, mc0=\E[0i,
-+	mc4=\E[?8i, mc5=\E[?4i, mgc=\E\:, nel=\EE,
- 	pln=\E[%p1%dp%p2%:-16s, rc=\E8,
--	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM,
--	rin=\E[%p1%dT, rmacs=^O, rmir=\E[4l, rmkx=\E[19;0|,
--	rmln=\E<, rmso=\E[m, rmul=\E[m, rmxon=\E[29;1|,
--	rs2=\E[5;0|, sc=\E7,
-+	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
-+	rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmso=\E[m, rmul=\E[m,
-+	rmxon=\E[29;1|, rs2=\E[5;0|, sc=\E7,
- 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
- 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smgl=\E4, smgr=\E5, smir=\E[4h,
- 	smkx=\E[19;1|, smln=\E?, smso=\E[7m, smul=\E[4m,
- 	smxon=\E[29;0|, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
-+	use=ecma+index,
- 
- # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
- att500|att513|AT&T 513 using page mode,
-@@ -13260,10 +13329,9 @@
- 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
- 	dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
- 	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
--	il1=\E[L, ind=\n, indn=\E[%p1%dS, kbs=^H, kclr=\E[2J,
--	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H,
--	kll=\E[70;1H, nel=\r\n, rc=\E8, ri=\E[T, rin=\E[%p1%dT,
--	rs1=\Ec, sc=\E7,
-+	il1=\E[L, ind=\n, kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B,
-+	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kll=\E[70;1H, nel=\r\n,
-+	rc=\E8, ri=\E[T, rs1=\Ec, sc=\E7, use=ecma+index,
- 
- # 5620 terminfo  (2.0 or later ROMS with char attributes)
- # The following SET-UP modes are assumed for normal operation:
-@@ -13284,12 +13352,12 @@
- 	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
- 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
- 	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich=\E[%p1%d@,
--	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
--	indn=\E[%p1%dS, kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B,
--	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kll=\E[70;1H, nel=\n,
-+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kbs=^H,
-+	kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-+	khome=\E[H, kll=\E[70;1H, nel=\n,
- 	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\E[T,
--	rin=\E[%p1%dT, rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7,
--	sgr0=\E[0m, smso=\E[7m, smul=\E[4m,
-+	rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7, sgr0=\E[0m,
-+	smso=\E[7m, smul=\E[4m, use=ecma+index,
- att5620-24|tty5620-24|dmd-24|teletype dmd 5620 in a 24x80 layer,
- 	lines#24, use=att5620,
- att5620-34|tty5620-34|dmd-34|teletype dmd 5620 in a 34x80 layer,
-@@ -13370,7 +13438,7 @@
- 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
- 	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H, ht=^I,
- 	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
--	indn=\E[%p1%dS, invis=\E[8m,
-+	invis=\E[8m,
- 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)0,
- 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A, kbs=^H,
- 	kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-@@ -13381,12 +13449,13 @@
- 	nel=\EE,
- 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
- 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
--	ri=\EM, rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
--	rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7,
-+	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p,
-+	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7,
- 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
- 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
- 	smln=\E[p, smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx,
-+	use=ecma+index,
- att610-w|AT&T 610; 132 column; 98key keyboard,
- 	cols#132, wsl#132,
- 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h,
-@@ -13445,7 +13514,7 @@
- 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
- 	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H, ht=^I,
- 	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
--	indn=\E[%p1%dS, invis=\E[8m,
-+	invis=\E[8m,
- 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h,
- 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @, kbs=^H,
- 	kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-@@ -13462,14 +13531,13 @@
- 	mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
- 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
- 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
--	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B\017, rmam=\E[?7l,
--	rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m,
--	rs2=\Ec\E[?3l, sc=\E7,
-+	ri=\EM, rmacs=\E(B\017, rmam=\E[?7l, rmir=\E[4l,
-+	rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7,
- 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
- 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\E)0\016%e\E(B\017%;,
- 	sgr0=\E[m\E(B\017, smacs=\E)0\016, smam=\E[?7h,
- 	smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m,
--	tsl=\E7\E[25;%i%p1%dx,
-+	tsl=\E7\E[25;%i%p1%dx, use=ecma+index,
- att620-w|AT&T 620; 132 column; 98key keyboard,
- 	cols#132, wsl#132,
- 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h,
-@@ -13516,19 +13584,19 @@
- 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
- 	dim=\E[2m, 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@, ich1=\E[@,
--	il=\E[%p1%dL, il1=\E[L, ind=\ED, indn=\E[%p1%dS, is2=\E[m,
--	kbs=^H, kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B,
--	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M, kent=\r,
--	kf10=\ENp, kf11=\ENq, kf12=\ENr, kf13=\ENs, kf14=\ENt,
--	kf15=\ENu, kf16=\ENv, kf17=\ENw, kf18=\ENx, kf19=\ENy,
--	kf20=\ENz, kf21=\EN{, kf22=\EN|, kf23=\EN}, kf24=\EN~,
--	kf9=\ENo, khome=\E[H, kich1=\E[@, kil1=\E[L, mc4=\E[?4i,
--	mc5=\E[?5i, nel=\r\n, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8,
--	rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmir=\E[4l, rmso=\E[m,
--	rmul=\E[m, rs2=\Ec, sc=\E7,
-+	il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E[m, kbs=^H, kcbt=\E[Z,
-+	kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-+	kdch1=\E[P, kdl1=\E[M, kent=\r, kf10=\ENp, kf11=\ENq,
-+	kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv,
-+	kf17=\ENw, kf18=\ENx, kf19=\ENy, kf20=\ENz, kf21=\EN{,
-+	kf22=\EN|, kf23=\EN}, kf24=\EN~, kf9=\ENo, khome=\E[H,
-+	kich1=\E[@, kil1=\E[L, mc4=\E[?4i, mc5=\E[?5i, nel=\r\n,
-+	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\EM,
-+	rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs2=\Ec, sc=\E7,
- 	sgr=\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%p4%|%t;7
- 	    %;m,
- 	sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-+	use=ecma+index,
- att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
- 	lines#24, use=att630,
- 
-@@ -14632,16 +14700,16 @@
- 	cvvis=\E[3;5v, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
- 	dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5l$<200/>\E[?5h,
- 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
--	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS,
-+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
- 	is2=\E<\E>\E[?1l\E[?3l\E[?4l\E[?5h\E[?7h\E[?8h\E[3g\E[>5g\E(
- 	    B\E[m\E[20l\E[1;24r\E[24;1H,
- 	kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
- 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rc=\E8,
--	rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmcup=, rmir=\E[4l,
--	rmso=\E[m, rmul=\E[m, rs1=\Ec\E[?7h\E[>5g, sc=\E7,
--	sgr0=\E[m, smcup=\E[>5g\E[?7h\E[?5h, smir=\E[4h,
--	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u6=\E[%i%p1%d;%p2%dR,
--	u7=\E[6n, u8=\E[?6c, u9=\E[c,
-+	rev=\E[7m, ri=\EM, rmcup=, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
-+	rs1=\Ec\E[?7h\E[>5g, sc=\E7, sgr0=\E[m,
-+	smcup=\E[>5g\E[?7h\E[?5h, smir=\E[4h, smso=\E[7m,
-+	smul=\E[4m, tbc=\E[3g, u6=\E[%i%p1%d;%p2%dR, u7=\E[6n,
-+	u8=\E[?6c, u9=\E[c, use=ecma+index,
- cit101e-n|CIT-101e w/o am,
- 	am@,
- 	cvvis=\E[?1l\E[?4l\E[?7l, kbs=^H, kcub1=^H, kcud1=\n,
-@@ -16945,25 +17013,25 @@
- 	cuu=\E[%p1%dA, cuu1=\E[A, dch1=\E[P, dl=\E[%p1%dM,
- 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H,
- 	hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
--	indn=\E[%p1%dS, invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z,
--	kclr=\E[144q, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
--	kcuu1=\E[A, kdch1=\E[P, ked=\E[148q, kel=\E[142q,
--	kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q,
--	kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q,
--	kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, kf19=\E[019q,
--	kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, kf22=\E[022q,
--	kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, kf26=\E[026q,
--	kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, kf3=\E[003q,
--	kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q,
--	kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q,
--	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
--	kf9=\E[009q, khome=\E[H, kich1=\E[139q, kil1=\E[140q,
--	kind=\E[151q, knp=\E[154q, kpp=\E[150q, kri=\E[155q,
--	krmir=\E[4l, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT, rmir=\E[4l,
--	rmso=\E[m, rmul=\E[m, rs2=\Ec,
-+	invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z, kclr=\E[144q,
-+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P,
-+	ked=\E[148q, kel=\E[142q, kend=\E[146q, kf1=\E[001q,
-+	kf10=\E[010q, kf11=\E[011q, kf12=\E[012q, kf13=\E[013q,
-+	kf14=\E[014q, kf15=\E[015q, kf16=\E[016q, kf17=\E[017q,
-+	kf18=\E[018q, kf19=\E[019q, kf2=\E[002q, kf20=\E[020q,
-+	kf21=\E[021q, kf22=\E[022q, kf23=\E[023q, kf24=\E[024q,
-+	kf25=\E[025q, kf26=\E[026q, kf27=\E[027q, kf28=\E[028q,
-+	kf29=\E[029q, kf3=\E[003q, kf30=\E[030q, kf31=\E[031q,
-+	kf32=\E[032q, kf33=\E[033q, kf34=\E[034q, kf35=\E[035q,
-+	kf36=\E[036q, kf4=\E[004q, kf5=\E[005q, kf6=\E[006q,
-+	kf7=\E[007q, kf8=\E[008q, kf9=\E[009q, khome=\E[H,
-+	kich1=\E[139q, kil1=\E[140q, kind=\E[151q, knp=\E[154q,
-+	kpp=\E[150q, kri=\E[155q, krmir=\E[4l, rev=\E[7m, ri=\E[T,
-+	rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs2=\Ec,
- 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
- 	    %;%?%p7%t;8%;m,
- 	sgr0=\E[0m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-+	use=ecma+index,
- 
- ibmaed|IBM Experimental display,
- 	OTbs, am, eo, msgr,
-@@ -17110,26 +17178,26 @@
- 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
- 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[2J, el=\E[0K,
- 	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, il=\E[%p1%dL,
--	il1=\E[L, ind=\ED, indn=\E[%p1%dS, invis=\E[8m, is2=\Ec,
--	kbs=^H, kcbt=\E[Z, kclr=\E[144q, kcub1=\E[D, kcud1=\E[B,
--	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, ked=\E[148q,
--	kel=\E[142q, kend=\E[146q, kf1=\E[001q, kf10=\E[010q,
--	kf11=\E[011q, kf12=\E[012q, kf13=\E[013q, kf14=\E[014q,
--	kf15=\E[015q, kf16=\E[016q, kf17=\E[017q, kf18=\E[018q,
--	kf19=\E[019q, kf2=\E[002q, kf20=\E[020q, kf21=\E[021q,
--	kf22=\E[022q, kf23=\E[023q, kf24=\E[024q, kf25=\E[025q,
--	kf26=\E[026q, kf27=\E[027q, kf28=\E[028q, kf29=\E[029q,
--	kf3=\E[003q, kf30=\E[030q, kf31=\E[031q, kf32=\E[032q,
--	kf33=\E[033q, kf34=\E[034q, kf35=\E[035q, kf36=\E[036q,
--	kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q,
--	kf8=\E[008q, kf9=\E[009q, khome=\E[H, kich1=\E[139q,
--	kil1=\E[140q, kind=\E[151q, knp=\E[154q, kpp=\E[150q,
--	kri=\E[155q, krmir=\E[4l, rev=\E[7m, ri=\EL, rin=\E[%p1%dT,
--	rmacs=\E(B, rmir=\E[4l, rmso=\E[0m, rmul=\E[0m, rs2=\Ec,
-+	il1=\E[L, ind=\ED, invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z,
-+	kclr=\E[144q, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-+	kcuu1=\E[A, kdch1=\E[P, ked=\E[148q, kel=\E[142q,
-+	kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q,
-+	kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q,
-+	kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, kf19=\E[019q,
-+	kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, kf22=\E[022q,
-+	kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, kf26=\E[026q,
-+	kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, kf3=\E[003q,
-+	kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q,
-+	kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q,
-+	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
-+	kf9=\E[009q, khome=\E[H, kich1=\E[139q, kil1=\E[140q,
-+	kind=\E[151q, knp=\E[154q, kpp=\E[150q, kri=\E[155q,
-+	krmir=\E[4l, rev=\E[7m, ri=\EL, rmacs=\E(B, rmir=\E[4l,
-+	rmso=\E[0m, rmul=\E[0m, rs2=\Ec,
- 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
- 	    %;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
- 	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
--	tbc=\E[3g,
-+	tbc=\E[3g, use=ecma+index,
- # "Megapel" refers to the display adapter, which was used with the IBM RT
- # aka IBM 6150.
- ibm5081|hft|IBM Megapel Color display,
-@@ -19201,18 +19269,19 @@
- 	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
- 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
- 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
--	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, is2=\E%!1,
--	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
--	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ,
--	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5,
--	lf5=F6, lf6=F8, ll=\E[30;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
--	rin=\E[%p1%dT, rmacs=^O, rmcup=\E%!0\ELBH=\E%!1,
--	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
-+	il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E%!1, kbs=^H,
-+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA,
-+	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR,
-+	kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8,
-+	ll=\E[30;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
-+	rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l, rmkx=\E[?1l\E>,
-+	rmso=\E[m, rmul=\E[m,
- 	rs2=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40
- 	    \ELI100\ELLA>\ELM0\EKE0\ENF1\EKS0\END0\E%!1\Ec\E[?3;5l
- 	    \E[?7;8h\E[r\E[m\E>,
- 	sc=\E7, sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
- 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-+	use=ecma+index,
- 
- #
- # Tektronix 4106/4107/4109 from BRL
-@@ -19247,18 +19316,19 @@
- 	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
- 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
- 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
--	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, is2=\E%!1,
--	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
--	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ,
--	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5,
--	lf5=F6, lf6=F8, ll=\E[32;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
--	rin=\E[%p1%dT, rmacs=^O, rmcup=\E%!0\ELBH=\E%!1,
--	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
-+	il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E%!1, kbs=^H,
-+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA,
-+	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR,
-+	kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8,
-+	ll=\E[32;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
-+	rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l, rmkx=\E[?1l\E>,
-+	rmso=\E[m, rmul=\E[m,
- 	rs1=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40
- 	    \ELI100\ELLB0\ELM0\EKE0\ENF1\EKS0\END0\ERE0\E%!1\Ec\E[?3
- 	    ;5l\E[?7;8h\E[r\E[m\E>,
- 	sc=\E7, sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
- 	smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, tbc=\E[3g,
-+	use=ecma+index,
- 
- # Tektronix 4107/4109 interpret 4 modes using "\E%!" followed by a code:
- # 0 selects Tek mode, i.e., \E%!0
-@@ -19972,12 +20042,12 @@
- 	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
- 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H,
- 	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
--	indn=\E[%p1%dS, invis=\E[8m, is2=\E[20l, kbs=^H,
--	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\E[9~,
--	kf1=\E[0~, kf2=\E[1~, kf3=\E[2~, kf4=\E[3~, kf5=\E[4~,
--	kf6=\E[5~, kf7=\E[6~, kf8=\E[7~, kf9=\E[8~, rev=\E[7m,
--	ri=\E[T, rin=\E[%p1%dT, rmacs=^O, rmso=\E[m, rmul=\E[m,
--	rs1=\Ec, sgr0=\E[m, smacs=^N, smso=\E[7m, smul=\E[4m,
-+	invis=\E[8m, is2=\E[20l, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-+	kcuf1=\E[C, kcuu1=\E[A, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~,
-+	kf3=\E[2~, kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~,
-+	kf8=\E[7~, kf9=\E[8~, rev=\E[7m, ri=\E[T, rmacs=^O,
-+	rmso=\E[m, rmul=\E[m, rs1=\Ec, sgr0=\E[m, smacs=^N,
-+	smso=\E[7m, smul=\E[4m, use=ecma+index,
- 
- # From: Hans Verkuil , 4 Dec 1995
- # (amiga: added empty  to suppress a warning.
-@@ -20027,20 +20097,20 @@
- 	cvvis=\E[>?6h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
- 	dl=\E[%p1%dM, dl1=\E[1M, ed=\E[J, el=\E[K, flash=^G,
- 	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[1L, ind=\ED,
--	indn=\E[%p1%dS, invis=\E8m,
-+	invis=\E8m,
- 	is2=\E[>?2;18l\E[>?26;?6;20;>?15;?7;>?22;>?8h,
- 	kbs=^H, kcbt=\233Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
- 	kcuu1=\E[A, kdch1=^?, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~,
- 	kf3=\E[2~, kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~,
- 	kf8=\E[7~, kf9=\E[8~, khlp=\E[?~, khome=\E[44~, kll=\E[45~,
- 	kmous=\E[M, knp=\E[42~, kpp=\E[41~, nel=\EE, oc=\E[0m,
--	rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmcup=\E[?7h\E[r\E[J,
--	rmkx=\E[?1l, rmso=\E[21m, rmul=\E[24m, rs1=\Ec,
-+	rev=\E[7m, ri=\EM, rmcup=\E[?7h\E[r\E[J, rmkx=\E[?1l,
-+	rmso=\E[21m, rmul=\E[24m, rs1=\Ec,
- 	rs2=\E[>?2;18l\E[>?26;?6;20;>?15;?7;>?22;>?8h,
- 	setab=\E[%?%p1%{8}%>%t%'F'%p1%+%d%e4%p1%d%;m,
- 	setaf=\E[%?%p1%{8}%>%t%'2'%p1%+%d%e3%p1%d%;m,
- 	sgr0=\E[0m\017\E[30;85;>15m, smcup=\E[?7h, smkx=\E[?1h,
--	smso=\E[1m, smul=\E[4m,
-+	smso=\E[1m, smul=\E[4m, use=ecma+index,
- 
- # MorphOS on Genesi Pegasos
- # By Pavel Fedin 
-@@ -20684,29 +20754,29 @@
- 
- putty-m1|Putty Minitel 1 "like" Couleurs,
- 	hs,
--	dim@, dsl=\E]2;\007, fsl=^G, indn=\E[%p1%dS, kf1=\E[11~,
--	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
--	rin=\E[%p1%dT, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
--	smcup=\E7\E[?47h, smul=\E[4m, tsl=\E]2;, .E3=\E[300S,
--	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=linux-m1,
-+	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
-+	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-+	rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
-+	smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
-+	Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m1,
- 
- putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir),
- 	hs,
--	dim@, dsl=\E]2;\007, fsl=^G, indn=\E[%p1%dS, kf1=\E[11~,
--	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
--	rin=\E[%p1%dT, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
--	smcup=\E7\E[?47h, smul=\E[4m, tsl=\E]2;, .E3=\E[300S,
--	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=linux-m1b,
-+	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
-+	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-+	rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
-+	smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
-+	Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m1b,
- 
- putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir),
- 	hs,
- 	acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{
- 	     {||}}~~,
--	dim@, dsl=\E]2;\007, fsl=^G, indn=\E[%p1%dS, kf1=\E[11~,
--	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
--	rin=\E[%p1%dT, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
--	smcup=\E7\E[?47h, smul=\E[4m, tsl=\E]2;, .E3=\E[300S,
--	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=linux-m2,
-+	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
-+	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-+	rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
-+	smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
-+	Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m2,
- 
- 
- screen.putty-m1|Putty m1 specific for screen,
-@@ -22702,19 +22772,19 @@
- 	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
- 	dl=\E[%p1%dM, dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
- 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
--	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S,
--	indn=\E[%p1%dS, invis=\E[9m, is2=\E[0;10;39m, kbs=^H,
--	kcbt=^], kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
--	kdch1=\E[P, kend=\E[Y, kf1=\EOP, kf10=\EOY, kf11=\EOZ,
--	kf12=\EOA, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU,
--	kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kich1=\E[@,
--	knp=\E[U, kpp=\E[V, krmir=\E0, nel=\r\E[S, rc=\E8, rev=\E[7m,
--	ri=\E[T, rin=\E[%p1%dT, rmacs=\E[10m, rmso=\E[m, rmul=\E[m,
--	sc=\E7,
-+	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
-+	is2=\E[0;10;39m, kbs=^H, kcbt=^], kcub1=\E[D, kcud1=\E[B,
-+	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kend=\E[Y, kf1=\EOP,
-+	kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf2=\EOQ, kf3=\EOR,
-+	kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
-+	khome=\E[H, kich1=\E[@, knp=\E[U, kpp=\E[V, krmir=\E0,
-+	nel=\r\E[S, rc=\E8, rev=\E[7m, ri=\E[T, rmacs=\E[10m,
-+	rmso=\E[m, rmul=\E[m, 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[3g, vpa=\E[%i%p1%dd, use=klone+color,
-+	tbc=\E[3g, vpa=\E[%i%p1%dd, use=ecma+index,
-+	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,
-@@ -26207,4 +26277,9 @@
- #	+ comment-out some user-defined capabilities in mintty+common to allow
- #	  builds with existing releases 5.9-6.1 -TD
- #
-+# 2019-06-30
-+#	+ add ms-terminal -TD
-+#	+ add vscode, vscode-direct -TD
-+#	+ use ecma+index in screen, st -TD
-+#
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: ncurses/Makefile.in
-Prereq:  1.161 
---- ncurses-6.1-20190623+/ncurses/Makefile.in	2019-05-11 14:15:21.000000000 +0000
-+++ ncurses-6.1-20190630/ncurses/Makefile.in	2019-06-30 14:57:27.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: Makefile.in,v 1.161 2019/05/11 14:15:21 tom Exp $
-+# $Id: Makefile.in,v 1.163 2019/06/30 14:57:27 tom Exp $
- ##############################################################################
- # Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -159,7 +159,8 @@
- 
- TERMINFO	= @TERMINFO@
- TERMINFO_SRC	= @TERMINFO_SRC@
--TIC_PATH	= @TIC_PATH@
-+TIC_PATH	= @TIC@
-+INFOCMP_PATH	= @INFOCMP@
- 
- AUTO_SRC = \
- 	./codes.c \
-@@ -221,7 +222,7 @@
- ../lib : ; mkdir $@
- 
- ./fallback.c : $(tinfo)/MKfallback.sh
--	$(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
-+	$(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(INFOCMP_PATH) $(FALLBACK_LIST) >$@
- 
- ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
- 	$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
-Index: ncurses/tinfo/MKfallback.sh
-Prereq:  1.21 
---- ncurses-6.1-20190623+/ncurses/tinfo/MKfallback.sh	2017-04-12 00:50:50.000000000 +0000
-+++ ncurses-6.1-20190630/ncurses/tinfo/MKfallback.sh	2019-06-30 10:44:15.000000000 +0000
-@@ -1,6 +1,6 @@
- #!/bin/sh
- ##############################################################################
--# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2017,2019 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -26,7 +26,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: MKfallback.sh,v 1.21 2017/04/12 00:50:50 tom Exp $
-+# $Id: MKfallback.sh,v 1.22 2019/06/30 10:44:15 tom Exp $
- #
- # MKfallback.sh -- create fallback table for entry reads
- #
-@@ -45,6 +45,9 @@
- tic_path=$1
- shift
- 
-+infocmp_path=$1
-+shift
-+
- case $tic_path in #(vi
- /*)
- 	tic_head=`echo "$tic_path" | sed -e 's,/[^/]*$,,'`
-@@ -89,7 +92,7 @@
- 	for x in $*
- 	do
- 		echo "/* $x */"
--		infocmp -E $x | sed -e 's/\/NCURSES_INT2/g'
-+		$infocmp_path -E $x | sed -e 's/\/NCURSES_INT2/g'
- 	done
- 
- 	cat <  Sun, 23 Jun 2019 11:31:40 -0400
-+ -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw/rules
---- ncurses-6.1-20190623+/package/debian-mingw/rules	2018-02-10 18:25:00.000000000 +0000
-+++ ncurses-6.1-20190630/package/debian-mingw/rules	2019-06-30 16:00:26.000000000 +0000
-@@ -50,6 +50,8 @@
- 	--with-cxx-shared \
- 	--with-develop \
- 	--with-fallbacks=unknown,rxvt \
-+	--with-tic-path=/usr/bin/tic$(MY_ABI) \
-+	--with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \
- 	--with-shared \
- 	--with-trace \
- 	--with-xterm-kbs=DEL \
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20190623+/package/debian-mingw64/changelog	2019-06-23 15:31:40.000000000 +0000
-+++ ncurses-6.1-20190630/package/debian-mingw64/changelog	2019-06-30 01:30:19.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190623) unstable; urgency=low
-+ncurses6 (6.1+20190630) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 23 Jun 2019 11:31:40 -0400
-+ -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/rules
---- ncurses-6.1-20190623+/package/debian-mingw64/rules	2018-02-10 18:25:00.000000000 +0000
-+++ ncurses-6.1-20190630/package/debian-mingw64/rules	2019-06-30 16:00:48.000000000 +0000
-@@ -50,6 +50,8 @@
- 	--with-cxx-shared \
- 	--with-develop \
- 	--with-fallbacks=unknown,rxvt \
-+	--with-tic-path=/usr/bin/tic$(MY_ABI) \
-+	--with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \
- 	--with-shared \
- 	--with-trace \
- 	--with-xterm-kbs=DEL \
-Index: package/debian/changelog
---- ncurses-6.1-20190623+/package/debian/changelog	2019-06-23 15:31:40.000000000 +0000
-+++ ncurses-6.1-20190630/package/debian/changelog	2019-06-30 01:30:19.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190623) unstable; urgency=low
-+ncurses6 (6.1+20190630) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 23 Jun 2019 11:31:40 -0400
-+ -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.336 
---- ncurses-6.1-20190623+/package/mingw-ncurses.nsi	2019-06-23 15:31:40.000000000 +0000
-+++ ncurses-6.1-20190630/package/mingw-ncurses.nsi	2019-06-30 01:30:19.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.336 2019/06/23 15:31:40 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.338 2019/06/30 01:30:19 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "0623"
-+!define VERSION_MMDD  "0630"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20190623+/package/mingw-ncurses.spec	2019-06-23 15:31:40.000000000 +0000
-+++ ncurses-6.1-20190630/package/mingw-ncurses.spec	2019-06-30 18:34:07.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20190623
-+Release: 20190630
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-@@ -68,6 +68,8 @@
- 	--with-cxx-shared \\\
- 	--with-develop \\\
- 	--with-fallbacks=unknown,xterm \\\
-+	--with-tic-path=/usr/bin/tic${MY_ABI} \\\
-+	--with-infocmp-path=/usr/bin/infocmp${MY_ABI} \\\
- 	--with-install-prefix=$RPM_BUILD_ROOT \\\
- 	--with-pc-suffix=%{MY_ABI} \\\
- 	--with-pcre2 \\\
-@@ -145,6 +147,9 @@
- 
- %changelog
- 
-+* Sun Jun 30 2019 Thomas E. Dickey
-+- use tic-path and infocmp-path options for fallbacks
-+
- * Sat Feb 10 2018 Thomas E. Dickey
- - add several development features
- 
-Index: package/ncurses.spec
---- ncurses-6.1-20190623+/package/ncurses.spec	2019-06-23 15:31:40.000000000 +0000
-+++ ncurses-6.1-20190630/package/ncurses.spec	2019-06-30 01:30:19.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20190623
-+Release: 20190630
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20190623+/package/ncursest.spec	2019-06-23 15:31:40.000000000 +0000
-+++ ncurses-6.1-20190630/package/ncursest.spec	2019-06-30 01:30:19.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20190623
-+Release: 20190630
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/tic.c
-Prereq:  1.276 
---- ncurses-6.1-20190623+/progs/tic.c	2019-05-10 21:00:25.000000000 +0000
-+++ ncurses-6.1-20190630/progs/tic.c	2019-06-29 23:23:22.000000000 +0000
-@@ -48,7 +48,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: tic.c,v 1.276 2019/05/10 21:00:25 tom Exp $")
-+MODULE_ID("$Id: tic.c,v 1.277 2019/06/29 23:23:22 tom Exp $")
- 
- #define STDIN_NAME ""
- 
-@@ -2931,6 +2931,11 @@
-     check_screen(tp);
- 
-     /*
-+     * These are probably both or none.
-+     */
-+    PAIRED(parm_index, parm_rindex);
-+
-+    /*
-      * These may be mismatched because the terminal description relies on
-      * restoring the cursor visibility by resetting it.
-      */
diff --git a/ncurses-6.1-20190706.patch b/ncurses-6.1-20190706.patch
deleted file mode 100644
index a83ef15..0000000
--- a/ncurses-6.1-20190706.patch
+++ /dev/null
@@ -1,309 +0,0 @@
-# ncurses 6.1 - patch 20190706 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190706.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jul  7 00:14:47 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                             |    6 ++
-# VERSION                          |    2 
-# dist.mk                          |    4 -
-# misc/terminfo.src                |   77 +++++++++++++++++++++++++++++++++----
-# package/debian-mingw/changelog   |    4 -
-# package/debian-mingw64/changelog |    4 -
-# package/debian/changelog         |    4 -
-# package/mingw-ncurses.nsi        |    4 -
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# package/ncursest.spec            |    2 
-# 11 files changed, 89 insertions(+), 22 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3342 
---- ncurses-6.1-20190630+/NEWS	2019-06-30 10:45:10.000000000 +0000
-+++ ncurses-6.1-20190706/NEWS	2019-07-06 20:51:46.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3342 2019/06/30 10:45:10 tom Exp $
-+-- $Id: NEWS,v 1.3344 2019/07/06 20:51:46 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,10 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20190706
-+	+ add domterm -TD
-+	+ improve comments for recent changes, add alias xterm.js -TD
-+
- 20190630
- 	+ add --with-tic-path and --with-infocmp-path to work around problems
- 	  building fallback source using pre-6.0 tic/infocmp.
-Index: VERSION
---- ncurses-6.1-20190630+/VERSION	2019-06-30 01:30:19.000000000 +0000
-+++ ncurses-6.1-20190706/VERSION	2019-07-06 09:10:26.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20190630
-+5:0:10	6.1	20190706
-Index: dist.mk
-Prereq:  1.1292 
---- ncurses-6.1-20190630+/dist.mk	2019-06-30 01:30:19.000000000 +0000
-+++ ncurses-6.1-20190706/dist.mk	2019-07-06 09:10:26.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1292 2019/06/30 01:30:19 tom Exp $
-+# $Id: dist.mk,v 1.1293 2019/07/06 09:10:26 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20190630
-+NCURSES_PATCH = 20190706
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: misc/terminfo.src
---- ncurses-6.1-20190630+/misc/terminfo.src	2019-06-30 20:05:21.000000000 +0000
-+++ ncurses-6.1-20190706/misc/terminfo.src	2019-07-06 20:35:26.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.749 $
--#	$Date: 2019/06/30 20:05:21 $
-+#	$Revision: 1.757 $
-+#	$Date: 2019/07/06 20:35:26 $
- #
- # 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
-@@ -4225,6 +4225,8 @@
- 
- # Windows 10 1903
- # Version 0.2.1715.0
-+# https://github.com/microsoft/terminal
-+#
- # The task manager shows this as "OpenConsole.exe", which differs
- # from the "Windows Command Processor" used for the command-prompt.
- #
-@@ -4247,9 +4249,9 @@
- # - a few generic xterm features are supported (set window title), but
- #   others are missing (such as the mouse).
- # - the cursor visible/invisible works in the PowerShell tab, not in "Legacy"
--# tack: 
-+# tack:
- # - blink, dim, bold, invis, protect do not work
--# - bce works (but per vttest, with ED, EL, not BCE)
-+# - bce works (but per vttest, with ED, EL, not ECH)
- # - does not support keypad application mode
- # - implements most of the xterm modified keys; sometimes modifiers are ignored
- #   or simply incorrect
-@@ -4262,7 +4264,8 @@
- 	use=xterm+pcfkeys, use=xterm-basic,
- 
- #### Visual Studio
--# Visual Studio Code 1.35.1
-+# Visual Studio Code 1.35.1 uses xterm.js (see https://xtermjs.org/).
-+# https://code.visualstudio.com/docs/editor/integrated-terminal
- #
- # This sets TERM to xterm-256color, which is a little more successful than
- # Windows Terminal.
-@@ -4289,11 +4292,11 @@
- # - mouse mode is not reset by reset-sequence
- # - supports italics and dim, but not cross-out or double-underline
- # - color-palette cannot be changed
--vscode|Visual Studio Code terminal,
-+vscode|xterm.js|Visual Studio Code terminal using xterm.js,
- 	npc,
- 	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=xterm+256setaf,
- 	use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys,
--	use=xterm-basic, use=xterm-basic,
-+	use=xterm-basic,
- vscode-direct|Visual Studio Code with direct-colors,
- 	use=xterm+indirect, use=vscode,
- 
-@@ -7012,6 +7015,62 @@
- 	use=xterm+pce2, use=xterm+pcc2, use=ecma+italics,
- 	use=xterm+alt1049,
- 
-+######## WEB CLIENTS
-+
-+#### DomTerm
-+# https://domterm.org
-+#
-+# Quoting its webpage:
-+#	The domterm command runs a server that manages sessions (usually shell
-+#	processes).  The user interface and terminal emulation is handled by a
-+#	JavaScript library that can run in a regular web browser or an embedded
-+#	browser such as Electron, using Web Sockets to talk to the server.
-+#
-+# it can connect to, and display in, a web browser, or as a standalone Qt
-+# application.  Either way, it displays in the current desktop session.
-+#
-+# Testing current code (2019/07/06) with Fedora 30:
-+# tack
-+#	no flash
-+#	no beep
-+#	no dim
-+#	no blink
-+#	no invis
-+#	no italics
-+#	ok smxx/rmxx
-+#	bce screen shows diagonal lines...
-+#	kf6 sends nothing
-+#	kf11 toggles maximize
-+#	cursor-key application mode works
-+#	numeric keypad application does not work; keys always send face-codes
-+#	sends utf-8 for meta, like xterm
-+# vttest
-+#	has problems with menu #1 (wrapping)
-+#	DA = vt200 with 132 columns, color
-+#	DA2 = 990, 100300 ("\E[>990;100300;0c")
-+#	no VT52, no double-size characters
-+#	vt220 ECH test works, SRM, DECSCA do not
-+#	S7C1T/S8C1t does not work
-+#	DECUDK does not work
-+#	CNL does not work; the other ECMA-48 cursor-movement tests work
-+#	REP sort-of works (does not match xterm)
-+#	SD/SU work, but not SL/SR
-+#	window reporting: works for size in chars/pixels, but not other tests
-+#	X10 mouse clicks work -- but return 4 rather than 1 for codes
-+#	any-event mouse mode acts like any-button mode
-+#	implements SGR mouse-mode
-+# other:
-+#	does not implement initc
-+#	does accept either colons or semicolon in 38/48 SGR.
-+domterm|DomTerm web client,
-+	npc,
-+	bel@, blink@, dim@, invis@, kcbt=\E[Z, ritm@, rmkx=\E[?1l,
-+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
-+	    %t;7%;m,
-+	sitm@, smkx=\E[?1h, use=xterm+256setaf, use=ecma+index,
-+	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm-basic,
-+	use=xterm-basic,
-+
- ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
- #
- 
-@@ -26282,4 +26341,8 @@
- #	+ add vscode, vscode-direct -TD
- #	+ use ecma+index in screen, st -TD
- #
-+# 2019-07-06
-+#	+ add domterm -TD
-+#	+ improve comments for recent changes, add alias xterm.js -TD
-+#
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20190630+/package/debian-mingw/changelog	2019-06-30 01:30:19.000000000 +0000
-+++ ncurses-6.1-20190706/package/debian-mingw/changelog	2019-07-06 09:10:26.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190630) unstable; urgency=low
-+ncurses6 (6.1+20190706) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
-+ -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20190630+/package/debian-mingw64/changelog	2019-06-30 01:30:19.000000000 +0000
-+++ ncurses-6.1-20190706/package/debian-mingw64/changelog	2019-07-06 09:10:26.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190630) unstable; urgency=low
-+ncurses6 (6.1+20190706) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
-+ -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20190630+/package/debian/changelog	2019-06-30 01:30:19.000000000 +0000
-+++ ncurses-6.1-20190706/package/debian/changelog	2019-07-06 09:10:26.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190630) unstable; urgency=low
-+ncurses6 (6.1+20190706) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 29 Jun 2019 21:29:49 -0400
-+ -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.338 
---- ncurses-6.1-20190630+/package/mingw-ncurses.nsi	2019-06-30 01:30:19.000000000 +0000
-+++ ncurses-6.1-20190706/package/mingw-ncurses.nsi	2019-07-06 09:10:26.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.338 2019/06/30 01:30:19 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.339 2019/07/06 09:10:26 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "0630"
-+!define VERSION_MMDD  "0706"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20190630+/package/mingw-ncurses.spec	2019-06-30 18:34:07.000000000 +0000
-+++ ncurses-6.1-20190706/package/mingw-ncurses.spec	2019-07-06 09:10:26.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20190630
-+Release: 20190706
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20190630+/package/ncurses.spec	2019-06-30 01:30:19.000000000 +0000
-+++ ncurses-6.1-20190706/package/ncurses.spec	2019-07-06 09:10:26.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20190630
-+Release: 20190706
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20190630+/package/ncursest.spec	2019-06-30 01:30:19.000000000 +0000
-+++ ncurses-6.1-20190706/package/ncursest.spec	2019-07-06 09:10:26.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20190630
-+Release: 20190706
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20190713.patch b/ncurses-6.1-20190713.patch
deleted file mode 100644
index 08bcffe..0000000
--- a/ncurses-6.1-20190713.patch
+++ /dev/null
@@ -1,904 +0,0 @@
-# ncurses 6.1 - patch 20190713 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190713.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jul 14 00:50:41 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                                                     |    8 ++
-# VERSION                                                  |    2 
-# dist.mk                                                  |    4 -
-# doc/html/ada/funcs/T.htm                                 |    2 
-# doc/html/ada/terminal_interface-curses-terminfo__adb.htm |    2 
-# doc/html/man/adacurses6-config.1.html                    |    2 
-# doc/html/man/captoinfo.1m.html                           |    2 
-# doc/html/man/clear.1.html                                |    2 
-# doc/html/man/curs_bkgd.3x.html                           |   10 ++-
-# doc/html/man/curs_mouse.3x.html                          |   13 ++--
-# doc/html/man/form.3x.html                                |    2 
-# doc/html/man/infocmp.1m.html                             |    2 
-# doc/html/man/infotocap.1m.html                           |    2 
-# doc/html/man/menu.3x.html                                |    2 
-# doc/html/man/ncurses.3x.html                             |    2 
-# doc/html/man/ncurses6-config.1.html                      |    2 
-# doc/html/man/panel.3x.html                               |    2 
-# doc/html/man/tabs.1.html                                 |    2 
-# doc/html/man/term.7.html                                 |    6 +-
-# doc/html/man/terminfo.5.html                             |   39 +++++++------
-# doc/html/man/tic.1m.html                                 |    2 
-# doc/html/man/toe.1m.html                                 |    2 
-# doc/html/man/tput.1.html                                 |    2 
-# doc/html/man/tset.1.html                                 |    2 
-# man/curs_bkgd.3x                                         |   10 ++-
-# man/curs_mouse.3x                                        |   18 +++---
-# man/term.7                                               |    6 +-
-# man/terminfo.head                                        |    6 +-
-# man/terminfo.tail                                        |   30 +++++-----
-# package/debian-mingw/changelog                           |    4 -
-# package/debian-mingw64/changelog                         |    4 -
-# package/debian/changelog                                 |    4 -
-# package/mingw-ncurses.nsi                                |    4 -
-# package/mingw-ncurses.spec                               |    2 
-# package/ncurses.spec                                     |    2 
-# package/ncursest.spec                                    |    2 
-# progs/reset_cmd.c                                        |    9 +--
-# test/padview.c                                           |   14 +++-
-# 38 files changed, 132 insertions(+), 99 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3344 
---- ncurses-6.1-20190706+/NEWS	2019-07-06 20:51:46.000000000 +0000
-+++ ncurses-6.1-20190713/NEWS	2019-07-13 23:10:57.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3344 2019/07/06 20:51:46 tom Exp $
-+-- $Id: NEWS,v 1.3347 2019/07/13 23:10:57 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,12 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20190713
-+	+ change reset's behavior for margins to simply clear soft-margins if
-+	  possible, rather than clearing and then setting them according to the
-+	  terminal's width (suggested by Thomas Wolff).
-+	+ correct order of one wbkgd versus start_color call in test/padview.c
-+
- 20190706
- 	+ add domterm -TD
- 	+ improve comments for recent changes, add alias xterm.js -TD
-Index: VERSION
---- ncurses-6.1-20190706+/VERSION	2019-07-06 09:10:26.000000000 +0000
-+++ ncurses-6.1-20190713/VERSION	2019-07-13 20:42:44.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20190706
-+5:0:10	6.1	20190713
-Index: dist.mk
-Prereq:  1.1293 
---- ncurses-6.1-20190706+/dist.mk	2019-07-06 09:10:26.000000000 +0000
-+++ ncurses-6.1-20190713/dist.mk	2019-07-13 20:42:44.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1293 2019/07/06 09:10:26 tom Exp $
-+# $Id: dist.mk,v 1.1294 2019/07/13 20:42:44 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20190706
-+NCURSES_PATCH = 20190713
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/ada/funcs/T.htm
---- ncurses-6.1-20190706+/doc/html/ada/funcs/T.htm	2019-06-15 23:31:13.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/ada/funcs/T.htm	2019-07-13 23:50:38.000000000 +0000
-@@ -20,8 +20,8 @@
- 
  • tgetnum
- 
  • tgetstr -  terminal_interface-curses-termcap.adb:108
- 
  • tgetstr -  terminal_interface-curses-termcap.adb:129
--
  • TGoto
- 
  • tgoto
-+
  • TGoto
- 
  • tigetflag
- 
  • tigetstr -  terminal_interface-curses-terminfo.adb:87
- 
  • tigetstr -  terminal_interface-curses-terminfo.adb:108
-Index: doc/html/ada/terminal_interface-curses-terminfo__adb.htm
---- ncurses-6.1-20190706+/doc/html/ada/terminal_interface-curses-terminfo__adb.htm	2019-03-16 19:34:48.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/ada/terminal_interface-curses-terminfo__adb.htm	2019-07-13 23:50:39.000000000 +0000
-@@ -151,7 +151,7 @@
-    end Get_Number;
- 
- ------------------------------------------------------------------------------
--   procedure Put_String (Str    : Terminfo_String;
-+   procedure Put_String (Str    : Terminfo_String;
-                          affcnt : Natural := 1;
-                          putc   : putctype := null) is
-       function tputs (str    : char_array;
-Index: doc/html/man/adacurses6-config.1.html
---- ncurses-6.1-20190706+/doc/html/man/adacurses6-config.1.html	2019-06-23 21:16:02.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/adacurses6-config.1.html	2019-07-13 23:50:33.000000000 +0000
-@@ -125,7 +125,7 @@
-

    • SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20190706+/doc/html/man/captoinfo.1m.html	2019-06-23 21:16:02.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/captoinfo.1m.html	2019-07-13 23:50:33.000000000 +0000
-@@ -190,7 +190,7 @@
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/clear.1.html
---- ncurses-6.1-20190706+/doc/html/man/clear.1.html	2019-06-23 21:16:02.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/clear.1.html	2019-07-13 23:50:33.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
- 
-Index: doc/html/man/curs_bkgd.3x.html
---- ncurses-6.1-20190706+/doc/html/man/curs_bkgd.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/curs_bkgd.3x.html	2019-07-13 23:50:33.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -121,6 +121,12 @@
-            rent  background,  and  then  adding  attributes from the new back-
-            ground.
- 
-+       If the background's character value is zero, a space is assumed.
-+
-+       If the terminal does not support  color,  or  if  color  has  not  been
-+       started   with   start_color,  the  new  background  character's  color
-+       attribute will be ignored.
-+
- 
-

    getbkgd

    -        The getbkgd function returns  the  given  window's  current  background
-Index: doc/html/man/curs_mouse.3x.html
---- ncurses-6.1-20190706+/doc/html/man/curs_mouse.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/curs_mouse.3x.html	2019-07-13 23:50:34.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -347,10 +347,11 @@
- 
-        Because  there  are  no standard terminal responses that would serve to
-        identify terminals which support the xterm mouse protocol, ncurses  as-
--       sumes  that  if  your  $TERM  environment variable contains "xterm", or
--       kmous is defined in the terminal description,  then  the  terminal  may
--       send mouse events.  The kmous capability is checked first, allowing the
--       use of newer xterm mouse protocols.
-+       sumes  that  if kmous is defined in the terminal description, or if the
-+       terminal description's primary  name  or  aliases  contain  the  string
-+       "xterm", then the terminal may send mouse events.  The kmous capability
-+       is checked first, allowing the use of newer xterm mouse protocols  such
-+       as xterm's private mode 1006.
- 
- 
-

    SEE ALSO

    -Index: doc/html/man/form.3x.html
---- ncurses-6.1-20190706+/doc/html/man/form.3x.html	2019-06-23 21:16:04.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/form.3x.html	2019-07-13 23:50:35.000000000 +0000
-@@ -246,7 +246,7 @@
-        curses(3x)  and  related  pages  whose names begin "form_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.1-20190706+/doc/html/man/infocmp.1m.html	2019-06-23 21:16:04.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/infocmp.1m.html	2019-07-13 23:50:36.000000000 +0000
-@@ -481,7 +481,7 @@
- 
-        https://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/infotocap.1m.html
---- ncurses-6.1-20190706+/doc/html/man/infotocap.1m.html	2019-06-23 21:16:04.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/infotocap.1m.html	2019-07-13 23:50:36.000000000 +0000
-@@ -85,7 +85,7 @@
-

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/menu.3x.html
---- ncurses-6.1-20190706+/doc/html/man/menu.3x.html	2019-06-23 21:16:05.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/menu.3x.html	2019-07-13 23:50:36.000000000 +0000
-@@ -221,7 +221,7 @@
-        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.1-20190706+/doc/html/man/ncurses.3x.html	2019-06-23 21:16:05.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/ncurses.3x.html	2019-07-13 23:50:37.000000000 +0000
-@@ -59,7 +59,7 @@
-        method of updating  character  screens  with  reasonable  optimization.
-        This  implementation  is  "new  curses"  (ncurses)  and is the approved
-        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
-        The  ncurses  library emulates the curses library of System V Release 4
-        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-Index: doc/html/man/ncurses6-config.1.html
---- ncurses-6.1-20190706+/doc/html/man/ncurses6-config.1.html	2019-06-23 21:16:05.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/ncurses6-config.1.html	2019-07-13 23:50:37.000000000 +0000
-@@ -112,7 +112,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.1-20190706+/doc/html/man/panel.3x.html	2019-06-23 21:16:05.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/panel.3x.html	2019-07-13 23:50:37.000000000 +0000
-@@ -204,7 +204,7 @@
-

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/tabs.1.html
---- ncurses-6.1-20190706+/doc/html/man/tabs.1.html	2019-06-23 21:16:06.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/tabs.1.html	2019-07-13 23:50:37.000000000 +0000
-@@ -205,7 +205,7 @@
-

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
- 
-Index: doc/html/man/term.7.html
---- ncurses-6.1-20190706+/doc/html/man/term.7.html	2019-03-16 19:34:46.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/term.7.html	2019-07-13 23:50:37.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -177,7 +177,7 @@
- 
-        -vb  Use visible bell (flash) rather than beep.
- 
--       -w   Wide; terminal is in 132 column mode.
-+       -w   Wide; terminal is in 132-column mode.
- 
-        Conventionally, if your terminal type is a variant intended to  specify
-        a  line  height,  that  suffix should go first.  So, for a hypothetical
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.1-20190706+/doc/html/man/terminfo.5.html	2019-06-23 21:16:06.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/terminfo.5.html	2019-07-13 23:50:37.000000000 +0000
-@@ -5,7 +5,7 @@
-   * Note: this must be run through tbl before nroff.
-   * The magic cookie on the first line triggers this under some man programs.
-   ****************************************************************************
--  * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -31,9 +31,9 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp @
-+  * @Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp @
-   * Head of terminfo man page ends here
--  * @Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp @
-+  * @Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp @
-   * Beginning of terminfo.tail file
-   * This file is part of ncurses.
-   * See "terminfo.head" for copyright.
-@@ -74,7 +74,7 @@
-        Terminfo describes terminals by giving a set of capabilities which they
-        have, by specifying how to perform screen operations, and by specifying
-        padding  requirements  and  initialization  sequences.   This describes
--       ncurses version 6.1 (patch 20190623).
-+       ncurses version 6.1 (patch 20190713).
- 
- 
-

    Terminfo Entry Syntax

    -@@ -124,7 +124,7 @@
-        ing  up the terminal should have a root name, thus "hp2621".  This name
-        should not contain hyphens.  Modes that the hardware can be in, or user
-        preferences,  should be indicated by appending a hyphen and a mode suf-
--       fix.  Thus, a vt100 in 132 column mode would be vt100-w.  The following
-+       fix.  Thus, a vt100 in 132-column mode would be vt100-w.  The following
-        suffixes should be used where possible:
- 
-             Suffix                  Meaning                   Example
-@@ -1902,10 +1902,14 @@
-               run the program
-                      iprog
- 
--              output is1 is2
-+              output
-+                     is1 and
-+                     is2
- 
-               set the margins using
--                     mgc, smgl and smgr
-+                     mgc or
-+                     smglp and smgrp or
-+                     smgl and smgr
- 
-               set tabs using
-                      tbc and hts
-@@ -1913,8 +1917,8 @@
-               print the file
-                      if
- 
--              and finally
--                     output is3.
-+              and finally output
-+                     is3.
- 
-        Most initialization is done with is2.  Special terminal  modes  can  be
-        set  up  without duplicating strings by putting the common sequences in
-@@ -1922,14 +1926,14 @@
- 
-        A set of sequences that does a harder  reset  from  a  totally  unknown
-        state can be given as rs1, rs2, rf and rs3, analogous to is1 , is2 , if
--       and is3 respectively.  These strings are output by  the  reset  program
--       (an  alias of tset), which is used when the terminal gets into a wedged
--       state.  Commands are normally placed in rs1, rs2 rs3  and  rf  only  if
--       they  produce annoying effects on the screen and are not necessary when
--       logging in.  For example, the command to set the vt100  into  80-column
--       mode would normally be part of is2, but it causes an annoying glitch of
--       the screen and is not normally needed since  the  terminal  is  usually
--       already in 80 column mode.
-+       and is3 respectively.  These strings are  output  by  reset  option  of
-+       tput,  or  by  the reset program (an alias of tset), which is used when
-+       the terminal gets into a wedged state.  Commands are normally placed in
-+       rs1, rs2 rs3 and rf only if they produce annoying effects on the screen
-+       and are not necessary when logging in.  For example, the command to set
-+       the  vt100  into  80-column  mode would normally be part of is2, but it
-+       causes an annoying glitch of the screen  and  is  not  normally  needed
-+       since the terminal is usually already in 80-column mode.
- 
-        The  reset  program  writes  strings including iprog, etc., in the same
-        order as the init program, using rs1, etc., instead of  is1,  etc.   If
-@@ -2146,7 +2150,6 @@
-                     green     COLOR_GREEN       2     0,max,0
-                     yellow    COLOR_YELLOW      3     max,max,0
-                     blue      COLOR_BLUE        4     0,0,max
--
-                     magenta   COLOR_MAGENTA     5     max,0,max
-                     cyan      COLOR_CYAN        6     0,max,max
-                     white     COLOR_WHITE       7     max,max,max
-Index: doc/html/man/tic.1m.html
---- ncurses-6.1-20190706+/doc/html/man/tic.1m.html	2019-06-23 21:16:06.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/tic.1m.html	2019-07-13 23:50:37.000000000 +0000
-@@ -365,7 +365,7 @@
-        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-        term(5).  terminfo(5).  user_caps(5).
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/toe.1m.html
---- ncurses-6.1-20190706+/doc/html/man/toe.1m.html	2019-06-23 21:16:06.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/toe.1m.html	2019-07-13 23:50:37.000000000 +0000
-@@ -113,7 +113,7 @@
-        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
-        minfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.1-20190706+/doc/html/man/tput.1.html	2019-06-23 21:16:06.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/tput.1.html	2019-07-13 23:50:37.000000000 +0000
-@@ -522,7 +522,7 @@
-

    SEE ALSO

    -        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.1-20190706+/doc/html/man/tset.1.html	2019-06-23 21:16:06.000000000 +0000
-+++ ncurses-6.1-20190713/doc/html/man/tset.1.html	2019-07-13 23:50:37.000000000 +0000
-@@ -389,7 +389,7 @@
-        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
-        ttys(5), environ(7)
- 
--       This describes ncurses version 6.1 (patch 20190623).
-+       This describes ncurses version 6.1 (patch 20190713).
- 
- 
- 
-Index: man/curs_bkgd.3x
-Prereq:  1.28 
---- ncurses-6.1-20190706+/man/curs_bkgd.3x	2018-12-09 00:45:05.000000000 +0000
-+++ ncurses-6.1-20190713/man/curs_bkgd.3x	2019-07-13 21:01:06.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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_bkgd.3x,v 1.28 2018/12/09 00:45:05 tom Exp $
-+.\" $Id: curs_bkgd.3x,v 1.29 2019/07/13 21:01:06 tom Exp $
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -112,6 +112,12 @@
- the library updates only the non-color attributes,
- first removing those which may have come from the current background,
- and then adding attributes from the new background.
-+.PP
-+If the background's character value is zero, a space is assumed.
-+.PP
-+If the terminal does not support color,
-+or if color has not been started with \fBstart_color\fP,
-+the new background character's color attribute will be ignored.
- .SS getbkgd
- .PP
- The \fBgetbkgd\fR function returns the given window's current background
-Index: man/curs_mouse.3x
-Prereq:  1.50 
---- ncurses-6.1-20190706+/man/curs_mouse.3x	2018-12-29 23:40:47.000000000 +0000
-+++ ncurses-6.1-20190713/man/curs_mouse.3x	2019-07-13 23:45:12.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_mouse.3x,v 1.50 2018/12/29 23:40:47 tom Exp $
-+.\" $Id: curs_mouse.3x,v 1.51 2019/07/13 23:45:12 tom Exp $
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
- .ie \n(.g .ds '' \(rq
-@@ -394,7 +394,7 @@
- .PP
- Mouse events under xterm will not be detected correctly in a window with
- its keypad bit off, since they are interpreted as a variety of function key.
--Your terminfo description should have \fBkmous\fR set to "\\E[M"
-+Your terminfo description should have \fBkmous\fR set to \*(``\\E[M\*(''
- (the beginning of the response from xterm for mouse clicks).
- Other values for \fBkmous\fR are permitted,
- but under the same assumption,
-@@ -402,11 +402,13 @@
- .PP
- Because there are no standard terminal responses that would serve to identify
- terminals which support the xterm mouse protocol, \fBncurses\fR assumes that
--if your $TERM environment variable contains \*(``xterm\*('',
--or \fBkmous\fR is defined in
--the terminal description, then the terminal may send mouse events.
--The \fBkmous\fP capability is checked first, allowing the
--use of newer xterm mouse protocols.
-+if \fBkmous\fR is defined in the terminal description,
-+or if the terminal description's primary name or aliases
-+contain the string \*(``xterm\*('',
-+then the terminal may send mouse events.
-+The \fBkmous\fP capability is checked first,
-+allowing the use of newer xterm mouse protocols
-+such as xterm's private mode 1006.
- .SH SEE ALSO
- \fBcurses\fR(3X),
- \fBcurs_kernel\fR(3X),
-Index: man/term.7
-Prereq:  1.26 
---- ncurses-6.1-20190706+/man/term.7	2018-07-28 22:19:56.000000000 +0000
-+++ ncurses-6.1-20190713/man/term.7	2019-07-13 23:17:23.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: term.7,v 1.26 2018/07/28 22:19:56 tom Exp $
-+.\" $Id: term.7,v 1.27 2019/07/13 23:17:23 tom Exp $
- .TH term 7
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -190,7 +190,7 @@
- Use visible bell (flash) rather than beep.
- .TP 5
- \-w
--Wide; terminal is in 132 column mode.
-+Wide; terminal is in 132-column mode.
- .PP
- Conventionally, if your terminal type is a variant intended to specify a
- line height, that suffix should go first.
-Index: man/terminfo.head
-Prereq:  1.35 
---- ncurses-6.1-20190706+/man/terminfo.head	2018-07-28 22:29:09.000000000 +0000
-+++ ncurses-6.1-20190713/man/terminfo.head	2019-07-13 23:17:33.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp $
-+.\" $Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp $
- .TH terminfo 5 "" "" "File Formats"
- .ds n 5
- .ds d @TERMINFO@
-@@ -124,7 +124,7 @@
- This name should not contain hyphens.
- Modes that the hardware can be in, or user preferences, should
- be indicated by appending a hyphen and a mode suffix.
--Thus, a vt100 in 132 column mode would be vt100\-w.
-+Thus, a vt100 in 132-column mode would be vt100\-w.
- The following suffixes should be used where possible:
- .PP
- .TS
-Index: man/terminfo.tail
-Prereq:  1.93 
---- ncurses-6.1-20190706+/man/terminfo.tail	2019-06-01 22:32:15.000000000 +0000
-+++ ncurses-6.1-20190713/man/terminfo.tail	2019-07-13 23:29:04.000000000 +0000
-@@ -1,4 +1,4 @@
--.\" $Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp $
-+.\" $Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp $
- .\" Beginning of terminfo.tail file
- .\" This file is part of ncurses.
- .\" See "terminfo.head" for copyright.
-@@ -1141,14 +1141,17 @@
- .B iprog
- .TP
- output
--.B is1
--.B is2
-+.br
-+\fBis1\fP and
-+.br
-+\fBis2\fP
- .TP
- set the margins using
--.BR mgc ,
--.B smgl
--and
--.B smgr
-+\fBmgc\fP or
-+.br
-+\fBsmglp\fP and \fBsmgrp\fP or
-+.br
-+\fBsmgl\fP and \fBsmgr\fP
- .TP
- set tabs using
- .B tbc
-@@ -1156,11 +1159,10 @@
- .B hts
- .TP
- print the file
--.B if
-+\fBif\fP
- .TP
--and finally
--output
--.BR is3 .
-+and finally output
-+\fBis3\fP.
- .RE
- .PP
- Most initialization is done with
-@@ -1187,7 +1189,9 @@
- and
- .B is3
- respectively.
--These strings are output by the \fB@RESET@\fP program
-+These strings are output
-+by \fIreset\fP option of \fB@TPUT@\fP,
-+or by the \fB@RESET@\fP program
- (an alias of \fB@TSET@\fP),
- which is used when the terminal gets into a wedged state.
- Commands are normally placed in
-@@ -1202,7 +1206,7 @@
- normally be part of
- .BR is2 ,
- but it causes an annoying glitch of the screen and is not normally
--needed since the terminal is usually already in 80 column mode.
-+needed since the terminal is usually already in 80-column mode.
- .PP
- The \fB@RESET@\fP program writes strings including
- .BR iprog ,
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20190706+/package/debian-mingw/changelog	2019-07-06 09:10:26.000000000 +0000
-+++ ncurses-6.1-20190713/package/debian-mingw/changelog	2019-07-13 20:42:44.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190706) unstable; urgency=low
-+ncurses6 (6.1+20190713) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
-+ -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20190706+/package/debian-mingw64/changelog	2019-07-06 09:10:26.000000000 +0000
-+++ ncurses-6.1-20190713/package/debian-mingw64/changelog	2019-07-13 20:42:44.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190706) unstable; urgency=low
-+ncurses6 (6.1+20190713) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
-+ -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20190706+/package/debian/changelog	2019-07-06 09:10:26.000000000 +0000
-+++ ncurses-6.1-20190713/package/debian/changelog	2019-07-13 20:42:44.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190706) unstable; urgency=low
-+ncurses6 (6.1+20190713) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 06 Jul 2019 05:10:26 -0400
-+ -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.339 
---- ncurses-6.1-20190706+/package/mingw-ncurses.nsi	2019-07-06 09:10:26.000000000 +0000
-+++ ncurses-6.1-20190713/package/mingw-ncurses.nsi	2019-07-13 20:42:44.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.339 2019/07/06 09:10:26 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.340 2019/07/13 20:42:44 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "0706"
-+!define VERSION_MMDD  "0713"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20190706+/package/mingw-ncurses.spec	2019-07-06 09:10:26.000000000 +0000
-+++ ncurses-6.1-20190713/package/mingw-ncurses.spec	2019-07-13 20:42:44.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20190706
-+Release: 20190713
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20190706+/package/ncurses.spec	2019-07-06 09:10:26.000000000 +0000
-+++ ncurses-6.1-20190713/package/ncurses.spec	2019-07-13 20:42:44.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20190706
-+Release: 20190713
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20190706+/package/ncursest.spec	2019-07-06 09:10:26.000000000 +0000
-+++ ncurses-6.1-20190713/package/ncursest.spec	2019-07-13 20:42:44.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20190706
-+Release: 20190713
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/reset_cmd.c
-Prereq:  1.17 
---- ncurses-6.1-20190706+/progs/reset_cmd.c	2019-05-25 22:36:53.000000000 +0000
-+++ ncurses-6.1-20190713/progs/reset_cmd.c	2019-07-13 21:35:13.000000000 +0000
-@@ -52,7 +52,7 @@
- #include 
- #endif
- 
--MODULE_ID("$Id: reset_cmd.c,v 1.17 2019/05/25 22:36:53 tom Exp $")
-+MODULE_ID("$Id: reset_cmd.c,v 1.18 2019/07/13 21:35:13 tom Exp $")
- 
- /*
-  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
-@@ -495,6 +495,9 @@
- 				  ? reset_2string
- 				  : init_2string);
- 
-+	if (VALID_STRING(clear_margins)) {
-+	    need_flush |= sent_string(clear_margins);
-+	} else
- #if defined(set_lr_margin)
- 	if (VALID_STRING(set_lr_margin)) {
- 	    need_flush |= sent_string(TPARM_2(set_lr_margin, 0,
-@@ -509,10 +512,8 @@
- 					      columns - 1));
- 	} else
- #endif
--	    if (VALID_STRING(clear_margins)
--		&& VALID_STRING(set_left_margin)
-+	    if (VALID_STRING(set_left_margin)
- 		&& VALID_STRING(set_right_margin)) {
--	    need_flush |= sent_string(clear_margins);
- 	    need_flush |= to_left_margin();
- 	    need_flush |= sent_string(set_left_margin);
- 	    if (VALID_STRING(parm_right_cursor)) {
-Index: test/padview.c
-Prereq:  1.13 
---- ncurses-6.1-20190706+/test/padview.c	2019-01-21 19:47:07.000000000 +0000
-+++ ncurses-6.1-20190713/test/padview.c	2019-07-13 20:41:47.000000000 +0000
-@@ -28,7 +28,7 @@
- /*
-  * clone of view.c, using pads
-  *
-- * $Id: padview.c,v 1.13 2019/01/21 19:47:07 tom Exp $
-+ * $Id: padview.c,v 1.14 2019/07/13 20:41:47 tom Exp $
-  */
- 
- #include 
-@@ -191,7 +191,7 @@
- 	failed("cannot allocate pad workspace");
-     if (try_color) {
- 	wattrset(my_pad, COLOR_PAIR(my_pair));
--	wbkgd(my_pad, (chtype) COLOR_PAIR(my_pair));
-+	wbkgd(my_pad, (chtype) (' ' | COLOR_PAIR(my_pair)));
-     }
- 
-     /*
-@@ -347,18 +347,22 @@
- 	nodelay(stdscr, TRUE);
-     idlok(stdscr, TRUE);	/* allow use of insert/delete line */
- 
--    my_pad = read_file(fname = argv[optind]);
--
-     if (try_color) {
- 	if (has_colors()) {
- 	    start_color();
- 	    init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
--	    bkgd((chtype) COLOR_PAIR(my_pair));
-+	    bkgd((chtype) (' ' | COLOR_PAIR(my_pair)));
- 	} else {
- 	    try_color = FALSE;
- 	}
-     }
- 
-+    /*
-+     * Do this after starting color, otherwise the pad's background will be
-+     * uncolored after the ncurses 6.1.20181208 fixes.
-+     */
-+    my_pad = read_file(fname = argv[optind]);
-+
-     my_row = 0;
-     while (!done) {
- 	int n, c;
diff --git a/ncurses-6.1-20190720.patch b/ncurses-6.1-20190720.patch
deleted file mode 100644
index 0505f4d..0000000
--- a/ncurses-6.1-20190720.patch
+++ /dev/null
@@ -1,1437 +0,0 @@
-# ncurses 6.1 - patch 20190720 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190720.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jul 21 01:22:45 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                                  |    9 ++
-# VERSION                               |    2 
-# dist.mk                               |    4 -
-# doc/html/man/adacurses6-config.1.html |    2 
-# doc/html/man/captoinfo.1m.html        |    2 
-# doc/html/man/clear.1.html             |    2 
-# doc/html/man/curs_get_wstr.3x.html    |   23 +++---
-# doc/html/man/curs_getstr.3x.html      |    8 +-
-# doc/html/man/form.3x.html             |    2 
-# doc/html/man/infocmp.1m.html          |   47 ++++++++++--
-# doc/html/man/infotocap.1m.html        |    2 
-# doc/html/man/menu.3x.html             |    2 
-# doc/html/man/ncurses.3x.html          |    2 
-# doc/html/man/ncurses6-config.1.html   |    2 
-# doc/html/man/panel.3x.html            |    2 
-# doc/html/man/tabs.1.html              |    2 
-# doc/html/man/terminfo.5.html          |   36 ++++++++-
-# doc/html/man/tic.1m.html              |  118 ++++++++++++++++++++++++++------
-# doc/html/man/toe.1m.html              |   65 ++++++++++++++++-
-# doc/html/man/tput.1.html              |    2 
-# doc/html/man/tset.1.html              |    2 
-# include/tic.h                         |    4 -
-# man/curs_get_wstr.3x                  |    8 +-
-# man/curs_getstr.3x                    |    8 +-
-# man/infocmp.1m                        |   30 +++++++-
-# man/man_db.renames                    |    3 
-# man/terminfo.tail                     |   35 ++++++++-
-# man/tic.1m                            |   92 +++++++++++++++++++++++-
-# man/toe.1m                            |   78 ++++++++++++++++++++-
-# ncurses/base/lib_mouse.c              |    8 +-
-# ncurses/base/lib_screen.c             |    8 +-
-# ncurses/tinfo/make_hash.c             |   12 +--
-# ncurses/tinfo/read_entry.c            |    6 -
-# package/debian-mingw/changelog        |    4 -
-# package/debian-mingw64/changelog      |    4 -
-# package/debian/changelog              |    4 -
-# package/mingw-ncurses.nsi             |    4 -
-# package/mingw-ncurses.spec            |    2 
-# package/ncurses.spec                  |    2 
-# package/ncursest.spec                 |    2 
-# 40 files changed, 531 insertions(+), 119 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3347 
---- ncurses-6.1-20190713+/NEWS	2019-07-13 23:10:57.000000000 +0000
-+++ ncurses-6.1-20190720/NEWS	2019-07-21 00:33:00.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3347 2019/07/13 23:10:57 tom Exp $
-+-- $Id: NEWS,v 1.3351 2019/07/21 00:33:00 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,13 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20190720
-+	+ fix a few warnings for gcc 4.x
-+	+ add some portability/historical details to the tic, toe and infocmp
-+	  manual pages.
-+	+ correct fix for broken link from terminfo(5) to tabs(1) manpage
-+	  (report by Sven Joachim).
-+
- 20190713
- 	+ change reset's behavior for margins to simply clear soft-margins if
- 	  possible, rather than clearing and then setting them according to the
-Index: VERSION
---- ncurses-6.1-20190713+/VERSION	2019-07-13 20:42:44.000000000 +0000
-+++ ncurses-6.1-20190720/VERSION	2019-07-20 10:26:30.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20190713
-+5:0:10	6.1	20190720
-Index: dist.mk
-Prereq:  1.1294 
---- ncurses-6.1-20190713+/dist.mk	2019-07-13 20:42:44.000000000 +0000
-+++ ncurses-6.1-20190720/dist.mk	2019-07-20 10:26:30.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1294 2019/07/13 20:42:44 tom Exp $
-+# $Id: dist.mk,v 1.1296 2019/07/20 10:26:30 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20190713
-+NCURSES_PATCH = 20190720
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/adacurses6-config.1.html
---- ncurses-6.1-20190713+/doc/html/man/adacurses6-config.1.html	2019-07-13 23:50:33.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/adacurses6-config.1.html	2019-07-20 18:53:10.000000000 +0000
-@@ -125,7 +125,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20190713+/doc/html/man/captoinfo.1m.html	2019-07-13 23:50:33.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/captoinfo.1m.html	2019-07-20 18:53:10.000000000 +0000
-@@ -190,7 +190,7 @@
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/clear.1.html
---- ncurses-6.1-20190713+/doc/html/man/clear.1.html	2019-07-13 23:50:33.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/clear.1.html	2019-07-20 18:53:10.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
- 
-Index: doc/html/man/curs_get_wstr.3x.html
---- ncurses-6.1-20190713+/doc/html/man/curs_get_wstr.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/curs_get_wstr.3x.html	2019-07-20 19:16:42.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -141,22 +141,23 @@
-        wchar_t  is  a  unsigned type.  All of the vendors implement this using
-        wint_t, following the standard.
- 
--       X/Open Curses issue 7 is unclear regarding whether the terminating null
--       wchar_t  value is counted in the length parameter n.  X/Open Curses is-
--       sue 7 revised the corresponding description of wgetnstr to address this
--       issue.   The unrevised description of wget_nwstr can be interpreted ei-
--       ther way.  This implementation counts the terminator in the length.
-+       X/Open Curses, Issue 7 (2009) is unclear regarding whether  the  termi-
-+       nating null wchar_t value is counted in the length parameter n.  X/Open
-+       Curses, Issue 7 revised the corresponding description  of  wgetnstr  to
-+       address this issue.  The unrevised description of wget_nwstr can be in-
-+       terpreted either way.  This implementation counts the terminator in the
-+       length.
- 
--       X/Open Curses does not specify what happens if the length  n  is  nega-
-+       X/Open  Curses  does  not specify what happens if the length n is nega-
-        tive.
- 
--       o   For  analogy  with  wgetnstr,  ncurses  6.2  uses a limit (based on
-+       o   For analogy with wgetnstr, ncurses  6.2  uses  a  limit  (based  on
-            LINE_MAX).
- 
--       o   Some other implementations (such as Solaris xcurses) do  the  same,
-+       o   Some  other  implementations (such as Solaris xcurses) do the same,
-            while others (PDCurses) do not allow this.
- 
--       o   NetBSD  7 curses imitates ncurses 6.1 in this regard, treating a -1
-+       o   NetBSD 7 curses imitates ncurses 6.1 in this regard, treating a  -1
-            as an indefinite number of characters.
- 
- 
-Index: doc/html/man/curs_getstr.3x.html
---- ncurses-6.1-20190713+/doc/html/man/curs_getstr.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/curs_getstr.3x.html	2019-07-20 19:16:43.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -457,17 +457,48 @@
-        /usr/share/terminfo Compiled terminal description database.
- 
- 
-+

    HISTORY

    -+       Although System V Release 2 provided a terminfo library, it had no doc-
-+       umented tool for decompiling the terminal  descriptions.   Tony  Hansen
-+       (AT&T) wrote the first infocmp in early 1984, for System V Release 3.
-+
-+       Eric  Raymond used the AT&T documentation in 1995 to provide an equiva-
-+       lent infocmp for ncurses.  In addition, he added  a  few  new  features
-+       such as:
-+
-+       o   the  -e option, to support fallback (compiled-in) terminal descrip-
-+           tions
-+
-+       o   the -i option, to help with analysis
-+
-+       Later, Thomas Dickey added the -x (user-defined  capabilities)  option,
-+       and  the  -E option to support fallback entries with user-defined capa-
-+       bilities.
-+
-+       For a complete list, see the EXTENSIONS section.
-+
-+       In 2010, Roy Marples provided an infocmp program  for  NetBSD.   It  is
-+       less  capable  than  the  SVr4  or ncurses versions (e.g., it lacks the
-+       sorting options documented in X/Open), but does include the  -x  option
-+       adapted from ncurses.
-+
-+
-+

    PORTABILITY

    -+       X/Open  Curses,  Issue  7 (2009) provides a description of infocmp.  It
-+       does not mention the options used for converting to termcap format.
-+
-+
-

    EXTENSIONS

    --       The  -0, -1, -E, -F, -G, -Q, -R, -T, -V, -a, -e, -f, -g, -i, -l, -p, -q
-+       The -0, -1, -E, -F, -G, -Q, -R, -T, -V, -a, -e, -f, -g, -i, -l, -p,  -q
-        and -t options are not supported in SVr4 curses.
- 
-        SVr4 infocmp does not distinguish between absent and cancelled capabil-
-        ities.  Also, it shows missing integer capabilities as -1 (the internal
--       value used to represent missing integers).  This  implementation  shows
-+       value  used  to represent missing integers).  This implementation shows
-        those as "NULL", for consistency with missing strings.
- 
--       The  -r  option's  notion of "termcap" capabilities is System V Release
--       4's.  Actual BSD curses versions will have a more restricted  set.   To
-+       The -r option's notion of "termcap" capabilities is  System  V  Release
-+       4's.   Actual  BSD curses versions will have a more restricted set.  To
-        see only the 4.4BSD set, use -r -RBSD.
- 
- 
-@@ -476,12 +507,12 @@
- 
- 
-

    SEE ALSO

    --       captoinfo(1m),   infotocap(1m),   tic(1m),  toe(1m),  curses(3x),  ter-
-+       captoinfo(1m),  infotocap(1m),  tic(1m),  toe(1m),   curses(3x),   ter-
-        minfo(5).  user_caps(5).
- 
-        https://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
-

    AUTHOR

    -@@ -506,6 +537,8 @@
- 
-
    • -
  • FILES
    • -+
  • HISTORY
    • -+
  • PORTABILITY
    • -
  • EXTENSIONS
    • -
  • BUGS
    • -
  • SEE ALSO
    • -Index: doc/html/man/infotocap.1m.html ---- ncurses-6.1-20190713+/doc/html/man/infotocap.1m.html 2019-07-13 23:50:36.000000000 +0000 -+++ ncurses-6.1-20190720/doc/html/man/infotocap.1m.html 2019-07-20 18:53:13.000000000 +0000 -@@ -85,7 +85,7 @@ -

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/menu.3x.html
---- ncurses-6.1-20190713+/doc/html/man/menu.3x.html	2019-07-13 23:50:36.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/menu.3x.html	2019-07-20 18:53:13.000000000 +0000
-@@ -221,7 +221,7 @@
-        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.1-20190713+/doc/html/man/ncurses.3x.html	2019-07-13 23:50:37.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/ncurses.3x.html	2019-07-20 18:53:14.000000000 +0000
-@@ -59,7 +59,7 @@
-        method of updating  character  screens  with  reasonable  optimization.
-        This  implementation  is  "new  curses"  (ncurses)  and is the approved
-        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
-        The  ncurses  library emulates the curses library of System V Release 4
-        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-Index: doc/html/man/ncurses6-config.1.html
---- ncurses-6.1-20190713+/doc/html/man/ncurses6-config.1.html	2019-07-13 23:50:37.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/ncurses6-config.1.html	2019-07-20 18:53:14.000000000 +0000
-@@ -112,7 +112,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.1-20190713+/doc/html/man/panel.3x.html	2019-07-13 23:50:37.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/panel.3x.html	2019-07-20 18:53:14.000000000 +0000
-@@ -204,7 +204,7 @@
-

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/tabs.1.html
---- ncurses-6.1-20190713+/doc/html/man/tabs.1.html	2019-07-13 23:50:37.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/tabs.1.html	2019-07-20 18:53:15.000000000 +0000
-@@ -205,7 +205,7 @@
-

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.1-20190713+/doc/html/man/terminfo.5.html	2019-07-13 23:50:37.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/terminfo.5.html	2019-07-20 18:53:15.000000000 +0000
-@@ -33,10 +33,34 @@
-   ****************************************************************************
-   * @Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp @
-   * Head of terminfo man page ends here
--  * @Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp @
--  * Beginning of terminfo.tail file
--  * This file is part of ncurses.
--  * See "terminfo.head" for copyright.
-+  ****************************************************************************
-+  * Copyright (c) 1998-2018,2019 Free 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: terminfo.tail,v 1.97 2019/07/20 10:20:57 tom Exp @
-   *.in -2
-   *.in +2
-   *.in -2
-@@ -74,7 +98,7 @@
-        Terminfo describes terminals by giving a set of capabilities which they
-        have, by specifying how to perform screen operations, and by specifying
-        padding  requirements  and  initialization  sequences.   This describes
--       ncurses version 6.1 (patch 20190713).
-+       ncurses version 6.1 (patch 20190720).
- 
- 
-

    Terminfo Entry Syntax

    -@@ -2457,7 +2481,7 @@
- 
- 
-

    SEE ALSO

    --       tabs(1m),  tic(1m), infocmp(1m), curses(3x), curs_color(3x), curs_vari-
-+       tabs(1),  tic(1m),  infocmp(1m), curses(3x), curs_color(3x), curs_vari-
-        ables(3x), printf(3), term(5).  term_variables(3x).  user_caps(5).
- 
- 
-Index: doc/html/man/tic.1m.html
---- ncurses-6.1-20190713+/doc/html/man/tic.1m.html	2019-07-13 23:50:37.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/tic.1m.html	2019-07-20 18:53:15.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tic.1m,v 1.69 2019/05/18 22:48:40 tom Exp @
-+  * @Id: tic.1m,v 1.74 2019/07/20 17:57:09 tom Exp @
- -->
- 
- 
-@@ -324,35 +324,108 @@
-        will be printed.
- 
- 
--

    COMPATIBILITY

    --       There is  some  evidence  that  historic  tic  implementations  treated
--       description  fields with no whitespace in them as additional aliases or
-+

    HISTORY

    -+       System V Release 2 provided  a  tic  utility.   It  accepted  a  single
-+       option:  -v  (optionally  followed  by  a  number).   According to Ross
-+       Ridge's comment in mytinfo, this version of tic was unable to represent
-+       cancelled capabilities.
-+
-+       System  V  Release 3 provided a different tic utility, written by Pavel
-+       Curtis, (originally named "compile" in pcurses).  This added an  option
-+       -c  to check the file for errors, with the caveat that errors in "use="
-+       links would not be reported.  System V Release 3 documented a few warn-
-+       ing messages which did not appear in pcurses.  While the program itself
-+       was changed little as development continued with System  V  Release  4,
-+       the table of capabilities grew from 180 (pcurses) to 464 (Solaris).
-+
-+       In  early  development of ncurses (1993), Zeyd Ben-Halim used the table
-+       from mytinfo to extend the  pcurses  table  to  469  capabilities  (456
-+       matched  SVr4, 8 were only in SVr4, 13 were not in SVr4).  Of those 13,
-+       11 were ultimately discarded (perhaps to  match  the  draft  of  X/Open
-+       Curses).   The exceptions were memory_lock_above and memory_unlock (see
-+       user_caps(5)).
-+
-+       Eric Raymond incorporated parts of mytinfo into  ncurses  to  implement
-+       the  termcap-to-terminfo  source conversion, and extended that to begin
-+       development of the corresponding terminfo-to-termcap source conversion,
-+       Thomas  Dickey  completed  that  development over the course of several
-+       years.
-+
-+       In 1999, Thomas Dickey added the  -x  option  to  support  user-defined
-+       capabilities.
-+
-+       In  2010,  Roy  Marples provided a tic program and terminfo library for
-+       NetBSD.  This implementation  adapts  several  features  from  ncurses,
-+       including tic's -x option.
-+
-+       The  -c  option  tells tic to check for problems in the terminfo source
-+       file.  Continued development provides additional checks:
-+
-+       o   pcurses had 8 warnings
-+
-+       o   ncurses in 1996 had 16 warnings
-+
-+       o   Solaris (SVr4) curses has 28 warnings
-+
-+       o   NetBSD tic in 2019 has 19 warnings.
-+
-+       o   ncurses in 2019 has 96 warnings
-+
-+       The checking done in ncurses' tic helps with the conversion to termcap,
-+       as well as pointing out errors and inconsistencies.  It is also used to
-+       ensure consistency with the user-defined capabilities.  There  are  527
-+       distinct  capabilities  in ncurses' terminal database; 128 of those are
-+       user-defined.
-+
-+
-+

    PORTABILITY

    -+       X/Open Curses, Issue 7 (2009) provides a brief description of tic.   It
-+       lists  one  option:  -c.  The omission of -v is unexpected.  The change
-+       history states that  the  description  is  derived  from  True64  UNIX.
-+       According  to  its  manual  pages,  that  system  also supported the -v
-+       option.
-+
-+       Shortly after Issue 7 was released,  Tru64  was  discontinued.   As  of
-+       2019,  the  surviving  implementations  of tic are SVr4 (AIX, HP-UX and
-+       Solaris), ncurses and NetBSD curses.
-+
-+       The X/Open rationale states that some implementations of tic read  ter-
-+       minal  descriptions  from  the  standard input if the file parameter is
-+       omitted.  None of these implementations do that.  Further, it  comments
-+       that some may choose to read from "./terminfo.src" but that is obsoles-
-+       cent behavior from SVr2, and is not (for example) a documented  feature
-+       of SVr3.
-+
-+
-+

    COMPATIBILITY

    -+       There  is  some  evidence  that  historic  tic  implementations treated
-+       description fields with no whitespace in them as additional aliases  or
-        short names.  This tic does not do that, but it does warn when descrip-
--       tion  fields may be treated that way and check them for dangerous char-
-+       tion fields may be treated that way and check them for dangerous  char-
-        acters.
- 
- 
--

    EXTENSIONS

    --       Unlike the SVr4 tic command, this implementation can  actually  compile
--       termcap  sources.   In fact, entries in terminfo and termcap syntax can
--       be mixed in a single source file.  See  terminfo(5)  for  the  list  of
-+

    EXTENSIONS

    -+       Unlike  the  SVr4 tic command, this implementation can actually compile
-+       termcap sources.  In fact, entries in terminfo and termcap  syntax  can
-+       be  mixed  in  a  single  source file.  See terminfo(5) for the list of
-        termcap names taken to be equivalent to terminfo names.
- 
--       The  SVr4  manual  pages  are not clear on the resolution rules for use
--       capabilities.  This implementation of tic will find  use  targets  any-
--       where  in  the source file, or anywhere in the file tree rooted at TER-
--       MINFO (if TERMINFO is defined), or in the user's $HOME/.terminfo  data-
-+       The SVr4 manual pages are not clear on the  resolution  rules  for  use
-+       capabilities.   This  implementation  of tic will find use targets any-
-+       where in the source file, or anywhere in the file tree rooted  at  TER-
-+       MINFO  (if TERMINFO is defined), or in the user's $HOME/.terminfo data-
-        base (if it exists), or (finally) anywhere in the system's file tree of
-        compiled entries.
- 
--       The error messages from this tic have the same format as  GNU  C  error
-+       The  error  messages  from this tic have the same format as GNU C error
-        messages, and can be parsed by GNU Emacs's compile facility.
- 
--       The  -0, -1, -C, -G, -I, -N, -R, -T, -V, -a, -e, -f, -g, -o, -r, -s, -t
-+       The -0, -1, -C, -G, -I, -N, -R, -T, -V, -a, -e, -f, -g, -o, -r, -s,  -t
-        and -x options are not supported under SVr4.  The SVr4 -c mode does not
--       report bad use links.
-+       report bad "use=" links.
- 
--       System  V  does  not  compile  entries  to  or  read  entries from your
-+       System V does  not  compile  entries  to  or  read  entries  from  your
-        $HOME/.terminfo database unless TERMINFO is explicitly set to it.
- 
- 
-@@ -365,7 +438,7 @@
-        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-        term(5).  terminfo(5).  user_caps(5).
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
-

    AUTHOR

    -@@ -387,8 +460,13 @@
- 
  • PROCESSING
    • 
- 
- 
--
  • COMPATIBILITY
    • 
--
  • EXTENSIONS
    • 
-+
  • HISTORY
    • 
-+
  • PORTABILITY
-+
-+
    • 
- 
  • FILES
    • 
- 
  • SEE ALSO
    • 
- 
  • AUTHOR
    • 
-Index: doc/html/man/toe.1m.html
---- ncurses-6.1-20190713+/doc/html/man/toe.1m.html	2019-07-13 23:50:37.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/toe.1m.html	2019-07-20 19:10:50.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -104,16 +104,73 @@
-               and exits.
- 
- 
-+

    EXAMPLES

    -+       Without sorting, the -a option reports all of the names found in all of
-+       the terminal databases found by the TERMINFO and TERMINFO_DIRS environ-
-+       ment variables:
-+
-+           MtxOrb162      16x2 Matrix Orbital LCD display
-+           MtxOrb204      20x4 Matrix Orbital LCD display
-+           MtxOrb         Generic Matrix Orbital LCD display
-+           qvt101+        qume qvt 101 PLUS product
-+           qvt119+-25     QVT 119 PLUS with 25 data lines
-+           qansi-g        QNX ANSI
-+           qvt103         qume qvt 103
-+           qnxw           QNX4 windows
-+           qansi-w        QNX ansi for windows
-+           qnxm           QNX4 with mouse events
-+           qvt203-25-w    QVT 203 PLUS with 25 by 132 columns
-+           qansi-t        QNX ansi without console writes
-+           . . .
-+
-+       Use the -a and -s options together to show where each terminal descrip-
-+       tion was found:
-+
-+           --> /usr/local/ncurses/share/terminfo
-+           ----> /usr/share/terminfo
-+           *-+-:     9term          Plan9 terminal emulator for X
-+           *---:     Eterm          Eterm with xterm-style color support (X Window System)
-+           *-*-:     Eterm-256color Eterm with xterm 256-colors
-+           *-*-:     Eterm-88color  Eterm with 88 colors
-+           *-+-:     MtxOrb         Generic Matrix Orbital LCD display
-+           *-+-:     MtxOrb162      16x2 Matrix Orbital LCD display
-+           *-+-:     MtxOrb204      20x4 Matrix Orbital LCD display
-+           *-*-:     NCR260VT300WPP NCR 2900_260 vt300 wide mode pc+  kybd
-+           *-+-:     aaa            ann arbor ambassador/30 lines
-+           *-+-:     aaa+dec        ann arbor ambassador in dec vt100 mode
-+           *-+-:     aaa+rv         ann arbor ambassador in reverse video
-+           . . .
-+
-+
-

    FILES

    -        /usr/share/terminfo/?/*
-             Compiled terminal description database.
- 
- 
-+

    HISTORY

    -+       This  utility  is  not  provided by other implementations.  There is no
-+       relevant X/Open or POSIX standard for toe.
-+
-+       The program name refers to a developer's pun:
-+
-+       o   tic,
-+
-+       o   tac (now tack),
-+
-+       o   toe.
-+
-+       It replaced a -T option which was  briefly  supported  by  the  ncurses
-+       infocmp utility in 1995.
-+
-+       The  -a  and -s options were added to toe several years later (2006 and
-+       2011, respectively).
-+
-+
-

    SEE ALSO

    -        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
-        minfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
- 
-@@ -124,7 +181,9 @@
- 
  • NAME
    • 
- 
  • SYNOPSIS
    • 
- 
  • DESCRIPTION
    • 
-+
  • EXAMPLES
    • 
- 
  • FILES
    • 
-+
  • HISTORY
    • 
- 
  • SEE ALSO
    • 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.1-20190713+/doc/html/man/tput.1.html	2019-07-13 23:50:37.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/tput.1.html	2019-07-20 18:53:15.000000000 +0000
-@@ -522,7 +522,7 @@
-

    SEE ALSO

    -        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.1-20190713+/doc/html/man/tset.1.html	2019-07-13 23:50:37.000000000 +0000
-+++ ncurses-6.1-20190720/doc/html/man/tset.1.html	2019-07-20 18:53:15.000000000 +0000
-@@ -389,7 +389,7 @@
-        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
-        ttys(5), environ(7)
- 
--       This describes ncurses version 6.1 (patch 20190713).
-+       This describes ncurses version 6.1 (patch 20190720).
- 
- 
- 
-Index: include/tic.h
-Prereq:  1.78 
---- ncurses-6.1-20190713+/include/tic.h	2019-03-10 00:06:02.000000000 +0000
-+++ ncurses-6.1-20190720/include/tic.h	2019-07-20 20:19:54.000000000 +0000
-@@ -33,7 +33,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: tic.h,v 1.78 2019/03/10 00:06:02 tom Exp $
-+ * $Id: tic.h,v 1.79 2019/07/20 20:19:54 tom Exp $
-  *	tic.h - Global variables and structures for the terminfo compiler.
-  */
- 
-@@ -93,7 +93,7 @@
- 
- #define IS_TIC_MAGIC(p)	(LOW_MSB(p) == MAGIC || LOW_MSB(p) == MAGIC2)
- 
--#define quick_prefix(s) (!strncmp((s), "b64:", 4) || !strncmp((s), "hex:", 4))
-+#define quick_prefix(s) (!strncmp((s), "b64:", (size_t)4) || !strncmp((s), "hex:", (size_t)4))
- 
- /*
-  * The "maximum" here is misleading; XSI guarantees minimum values, which a
-Index: man/curs_get_wstr.3x
-Prereq:  1.16 
---- ncurses-6.1-20190713+/man/curs_get_wstr.3x	2018-09-01 20:58:10.000000000 +0000
-+++ ncurses-6.1-20190720/man/curs_get_wstr.3x	2019-07-20 19:14:56.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2002-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2002-2018,2019 Free 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_get_wstr.3x,v 1.16 2018/09/01 20:58:10 tom Exp $
-+.\" $Id: curs_get_wstr.3x,v 1.18 2019/07/20 19:14:56 tom Exp $
- .TH curs_get_wstr 3X ""
- .de bP
- .ie n  .IP \(bu 4
-@@ -189,10 +189,10 @@
- while \fBwchar_t\fP is a unsigned type.
- All of the vendors implement this using \fBwint_t\fR, following the standard.
- .PP
--X/Open Curses issue 7 is unclear regarding whether
-+X/Open Curses, Issue 7 (2009) is unclear regarding whether
- the terminating \fInull \fP\fBwchar_t\fP
- value is counted in the length parameter \fIn\fP.
--X/Open Curses issue 7 revised the corresponding description
-+X/Open Curses, Issue 7 revised the corresponding description
- of \fBwgetnstr\fP to address this issue.
- The unrevised description of \fBwget_nwstr\fP can be interpreted either way.
- This implementation counts the terminator in the length.
-Index: man/curs_getstr.3x
-Prereq:  1.26 
---- ncurses-6.1-20190713+/man/curs_getstr.3x	2018-09-01 20:34:52.000000000 +0000
-+++ ncurses-6.1-20190720/man/curs_getstr.3x	2019-07-20 19:14:56.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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_getstr.3x,v 1.26 2018/09/01 20:34:52 tom Exp $
-+.\" $Id: curs_getstr.3x,v 1.28 2019/07/20 19:14:56 tom Exp $
- .TH curs_getstr 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -140,10 +140,10 @@
- The functions \fBgetnstr\fR, \fBmvgetnstr\fR, and \fBmvwgetnstr\fR were
- present but not documented in SVr4.
- .PP
--X/Open Curses issue 5 (2007) stated that these functions
-+X/Open Curses, Issue 5 (2007) stated that these functions
- \*(``read at most \fIn\fP bytes\*(''
- but did not state whether the terminating NUL is counted in that limit.
--X/Open Curses issue 7 (2009) changed that to say they
-+X/Open Curses, Issue 7 (2009) changed that to say they
- \*(``read at most \fIn\fP\-1 bytes\*(''
- to allow for the terminating NUL.
- As of 2018, some implementations do, some do not count it:
-Index: man/infocmp.1m
-Prereq:  1.74 
---- ncurses-6.1-20190713+/man/infocmp.1m	2019-05-18 22:00:55.000000000 +0000
-+++ ncurses-6.1-20190720/man/infocmp.1m	2019-07-20 18:42:11.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: infocmp.1m,v 1.74 2019/05/18 22:00:55 tom Exp $
-+.\" $Id: infocmp.1m,v 1.75 2019/07/20 18:42:11 tom Exp $
- .TH @INFOCMP@ 1M ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -560,6 +560,34 @@
- .TP 20
- \*d
- Compiled terminal description database.
-+.SH HISTORY
-+Although System V Release 2 provided a terminfo library,
-+it had no documented tool for decompiling the terminal descriptions.
-+Tony Hansen (AT&T) wrote the first \fBinfocmp\fP in early 1984,
-+for System V Release 3.
-+.PP
-+Eric Raymond used the AT&T documentation in 1995 to provide an equivalent
-+\fB@INFOCMP@\fP for ncurses.
-+In addition, he added a few new features such as:
-+.bP
-+the \fB\-e\fP option, to support \fIfallback\fP
-+(compiled-in) terminal descriptions
-+.bP
-+the \fB\-i\fP option, to help with analysis 
-+.PP
-+Later, Thomas Dickey added the \fB\-x\fP (user-defined capabilities)
-+option, and the \fB\-E\fP option to support fallback entries with
-+user-defined capabilities.
-+.PP
-+For a complete list, see the \fIEXTENSIONS\fP section.
-+.PP
-+In 2010, Roy Marples provided an \fBinfocmp\fP program for NetBSD.
-+It is less capable than the SVr4 or ncurses versions
-+(e.g., it lacks the sorting options documented in X/Open),
-+but does include the \fB\-x\fP option adapted from ncurses.
-+.SH PORTABILITY
-+X/Open Curses, Issue 7 (2009) provides a description of \fBinfocmp\fP.
-+It does not mention the options used for converting to termcap format.
- .SH EXTENSIONS
- The
- \fB\-0\fR,
-Index: man/man_db.renames
-Prereq:  1.54 
---- ncurses-6.1-20190713+/man/man_db.renames	2019-06-23 19:12:27.000000000 +0000
-+++ ncurses-6.1-20190720/man/man_db.renames	2019-07-20 10:18:12.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: man_db.renames,v 1.54 2019/06/23 19:12:27 tom Exp $
-+# $Id: man_db.renames,v 1.55 2019/07/20 10:18:12 Sven.Joachim Exp $
- # Manual-page renamings for the man_db program
- #
- # Files:
-@@ -171,7 +171,6 @@
- wresize.3x			wresize.3ncurses
- #
- # Other:
--tabs.1m				tabs.1
- tack.1m				tack.1
- #
- getty.1				getty.8
-Index: man/terminfo.tail
-Prereq:  1.95 
---- ncurses-6.1-20190713+/man/terminfo.tail	2019-07-13 23:29:04.000000000 +0000
-+++ ncurses-6.1-20190720/man/terminfo.tail	2019-07-20 10:20:57.000000000 +0000
-@@ -1,7 +1,32 @@
--.\" $Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp $
--.\" Beginning of terminfo.tail file
--.\" This file is part of ncurses.
--.\" See "terminfo.head" for copyright.
-+.\"***************************************************************************
-+.\" Copyright (c) 1998-2018,2019 Free 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: terminfo.tail,v 1.97 2019/07/20 10:20:57 tom Exp $
- .ps +1
- .SS User-Defined Capabilities
- .
-@@ -1879,7 +1904,7 @@
- \*d/?/*
- files containing terminal descriptions
- .SH SEE ALSO
--\fB@TABS@\fR(1M),
-+\fB@TABS@\fR(1),
- \fB@TIC@\fR(1M),
- \fB@INFOCMP@\fR(1M),
- \fBcurses\fR(3X),
-Index: man/tic.1m
-Prereq:  1.69 
---- ncurses-6.1-20190713+/man/tic.1m	2019-05-18 22:48:40.000000000 +0000
-+++ ncurses-6.1-20190720/man/tic.1m	2019-07-20 17:57:09.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tic.1m,v 1.69 2019/05/18 22:48:40 tom Exp $
-+.\" $Id: tic.1m,v 1.74 2019/07/20 17:57:09 tom Exp $
- .TH @TIC@ 1M ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -402,14 +402,98 @@
- (32 characters on systems with long filenames, 14 characters otherwise)
- will be truncated to the maximum alias length
- and a warning message will be printed.
--.SH COMPATIBILITY
-+.SH HISTORY
-+.PP
-+System V Release 2 provided a \fBtic\fP utility.
-+It accepted a single option: \fB\-v\fP (optionally followed by a number).
-+According to Ross Ridge's comment in \fImytinfo\fP,
-+this version of \fBtic\fP was
-+unable to represent cancelled capabilities.
-+.PP
-+System V Release 3 provided a different \fBtic\fP utility,
-+written by Pavel Curtis,
-+(originally named \*(``compile\*('' in \fIpcurses\fP).
-+This added an option \fB\-c\fP to check the file for
-+errors, with the caveat that errors in \*(``use=\*('' links
-+would not be reported.
-+System V Release 3 documented a few warning messages which
-+did not appear in \fIpcurses\fP.
-+While the program itself was changed little as development
-+continued with System V Release 4,
-+the table of capabilities grew from 180 (\fIpcurses\fP) to 464 (Solaris).
-+.PP
-+In early development of ncurses (1993),
-+Zeyd Ben-Halim used the table from \fImytinfo\fP to
-+extend the \fIpcurses\fP table to 469 capabilities
-+(456 matched SVr4, 8 were only in SVr4, 13 were not in SVr4).
-+Of those 13, 11 were ultimately discarded
-+(perhaps to match the draft of X/Open Curses).
-+The exceptions were
-+\fBmemory_lock_above\fP and
-+\fBmemory_unlock\fP (see \fBuser_caps\fP(5)).
-+.PP
-+Eric Raymond incorporated parts of \fImytinfo\fP into ncurses
-+to implement the termcap-to-terminfo source conversion,
-+and extended that to begin development of 
-+the corresponding terminfo-to-termcap source conversion,
-+Thomas Dickey completed that development over the course of several years.
-+.PP
-+In 1999, Thomas Dickey added the \fB\-x\fP option
-+to support user-defined capabilities.
-+.PP
-+In 2010, Roy Marples provided a \fBtic\fP program
-+and terminfo library for NetBSD.
-+This implementation adapts several features from ncurses,
-+including \fB@TIC@\fP's \fB\-x\fP option.
-+.PP
-+The \fB\-c\fP option tells \fB@TIC@\fP to check for problems in the
-+terminfo source file.
-+Continued development provides additional checks:
-+.bP
-+\fIpcurses\fP had 8 warnings
-+.bP
-+ncurses in 1996 had 16 warnings
-+.bP
-+Solaris (SVr4) curses has 28 warnings
-+.bP
-+NetBSD tic in 2019 has 19 warnings.
-+.bP
-+ncurses in 2019 has 96 warnings
-+.PP
-+The checking done in ncurses' \fB@TIC@\fP helps with the conversion to
-+termcap, as well as pointing out errors and inconsistencies.
-+It is also used to ensure consistency with the user-defined capabilities.
-+There are 527 distinct capabilities in ncurses' terminal database;
-+128 of those are user-defined.
-+.SH PORTABILITY
-+.PP
-+X/Open Curses, Issue 7 (2009) provides a brief description of \fBtic\fP.
-+It lists one option: \fB\-c\fP.
-+The omission of \fB\-v\fP is unexpected.
-+The change history states that the description is derived from True64 UNIX.
-+According to its manual pages, that system also supported the \fB\-v\fP option.
-+.PP
-+Shortly after Issue 7 was released, Tru64 was discontinued.
-+As of 2019, the surviving implementations of \fBtic\fP
-+are SVr4 (AIX, HP-UX and Solaris),
-+ncurses
-+and NetBSD curses.
-+.PP
-+The X/Open rationale states that some implementations of \fBtic\fP
-+read terminal descriptions from the standard input if the \fIfile\fP
-+parameter is omitted.
-+None of these implementations do that.
-+Further, it comments that some may choose to read from \*(''./terminfo.src\*(''
-+but that is obsolescent behavior from SVr2,
-+and is not (for example) a documented feature of SVr3.
-+.SS COMPATIBILITY
- There is some evidence that historic \fB@TIC@\fR implementations treated
- description fields with no whitespace in them as additional aliases or
- short names.
- This \fB@TIC@\fR does not do that, but it does warn when
- description fields may be treated that way and check them for dangerous
- characters.
--.SH EXTENSIONS
-+.SS EXTENSIONS
- Unlike the SVr4 \fB@TIC@\fR command, this implementation can actually
- compile termcap sources.
- In fact, entries in terminfo and termcap syntax can
-@@ -451,7 +535,7 @@
- \fB\-x\fR
- options
- are not supported under SVr4.
--The SVr4 \fB\-c\fR mode does not report bad use links.
-+The SVr4 \fB\-c\fR mode does not report bad \*(``use=\*('' links.
- .PP
- System V does not compile entries to or read entries from your
- \fI$HOME/.terminfo\fR database unless TERMINFO is explicitly set to it.
-Index: man/toe.1m
-Prereq:  1.29 
---- ncurses-6.1-20190713+/man/toe.1m	2017-02-18 17:10:26.000000000 +0000
-+++ ncurses-6.1-20190720/man/toe.1m	2019-07-20 19:06:44.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2017,2019 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,12 +26,30 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: toe.1m,v 1.29 2017/02/18 17:10:26 tom Exp $
-+.\" $Id: toe.1m,v 1.31 2019/07/20 19:06:44 tom Exp $
- .TH @TOE@ 1M ""
-+.de bP
-+.ie n  .IP \(bu 4
-+.el    .IP \(bu 2
-+..
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
- .ie \n(.g .ds '' \(rq
- .el       .ds '' ''
-+.de NS
-+.ie n  .sp
-+.el    .sp .5
-+.ie n  .in +4
-+.el    .in +2
-+.nf
-+.ft C			\" Courier
-+..
-+.de NE
-+.fi
-+.ft R
-+.ie n  .in -4
-+.el    .in -2
-+..
- .ds n 5
- .ds d @TERMINFO@
- .SH NAME
-@@ -103,10 +121,66 @@
- \fB\-V\fR
- reports the version of ncurses which was used in this program,
- and exits.
-+.SH EXAMPLES
-+.PP
-+Without sorting, the \fB\-a\fP option reports all of the names found
-+in all of the terminal databases found by the \fBTERMINFO\fP and
-+\fBTERMINFO_DIRS\fP environment variables:
-+.NS
-+MtxOrb162 	16x2 Matrix Orbital LCD display
-+MtxOrb204 	20x4 Matrix Orbital LCD display
-+MtxOrb    	Generic Matrix Orbital LCD display
-+qvt101+   	qume qvt 101 PLUS product
-+qvt119+-25	QVT 119 PLUS with 25 data lines
-+qansi-g   	QNX ANSI
-+qvt103    	qume qvt 103
-+qnxw      	QNX4 windows
-+qansi-w   	QNX ansi for windows
-+qnxm      	QNX4 with mouse events
-+qvt203-25-w	QVT 203 PLUS with 25 by 132 columns
-+qansi-t   	QNX ansi without console writes
-+\&.\ .\ .
-+.NE
-+.PP
-+Use the \fB\-a\fP and \fB\-s\fP options together to show where each terminal
-+description was found:
-+.NS
-+--> /usr/local/ncurses/share/terminfo
-+----> /usr/share/terminfo
-+*-+-:	9term     	Plan9 terminal emulator for X
-+*---:	Eterm     	Eterm with xterm-style color support (X Window System)
-+*-*-:	Eterm-256color	Eterm with xterm 256-colors
-+*-*-:	Eterm-88color	Eterm with 88 colors
-+*-+-:	MtxOrb    	Generic Matrix Orbital LCD display
-+*-+-:	MtxOrb162 	16x2 Matrix Orbital LCD display
-+*-+-:	MtxOrb204 	20x4 Matrix Orbital LCD display
-+*-*-:	NCR260VT300WPP	NCR 2900_260 vt300 wide mode pc+  kybd
-+*-+-:	aaa       	ann arbor ambassador/30 lines
-+*-+-:	aaa+dec   	ann arbor ambassador in dec vt100 mode
-+*-+-:	aaa+rv    	ann arbor ambassador in reverse video
-+\&.\ .\ .
-+.NE
- .SH FILES
- .TP 5
- \fB\*d/?/*\fR
- Compiled terminal description database.
-+.SH HISTORY
-+This utility is not provided by other implementations.
-+There is no relevant X/Open or POSIX standard for \fB@TOE@\fP.
-+.PP 
-+The program name refers to a developer's pun:
-+.bP
-+\fBtic\fP,
-+.bP
-+\fBtac\fP (now \fBtack\fP),
-+.bP
-+\fBtoe\fP.
-+.PP
-+It replaced a \fB\-T\fP option which was briefly supported by
-+the ncurses \fBinfocmp\fP utility in 1995.
-+.PP
-+The \fB\-a\fP and \fB\-s\fP options were added to 
-+\fB@TOE@\fR several years later (2006 and 2011, respectively).
- .SH SEE ALSO
- \fB@TIC@\fR(1M),
- \fB@INFOCMP@\fR(1M),
-Index: ncurses/base/lib_mouse.c
-Prereq:  1.181 
---- ncurses-6.1-20190713+/ncurses/base/lib_mouse.c	2018-11-24 17:28:37.000000000 +0000
-+++ ncurses-6.1-20190720/ncurses/base/lib_mouse.c	2019-07-20 20:42:43.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -84,7 +84,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_mouse.c,v 1.181 2018/11/24 17:28:37 tom Exp $")
-+MODULE_ID("$Id: lib_mouse.c,v 1.182 2019/07/20 20:42:43 tom Exp $")
- 
- #include 
- 
-@@ -1103,7 +1103,7 @@
- #else
- 			    sp->_ifd,
- #endif
--			    kbuf + grabbed, 1);
-+			    (kbuf + grabbed), (size_t) 1);
- 	if (res == -1)
- 	    break;
- 	grabbed += (size_t) res;
-@@ -1188,7 +1188,7 @@
- #else
- 			    sp->_ifd,
- #endif
--			    kbuf + grabbed, 1);
-+			    (kbuf + grabbed), (size_t) 1);
- 	if (res == -1)
- 	    break;
- 	if ((grabbed + MAX_KBUF) >= (int) sizeof(kbuf)) {
-Index: ncurses/base/lib_screen.c
-Prereq:  1.95 
---- ncurses-6.1-20190713+/ncurses/base/lib_screen.c	2019-05-04 20:31:31.000000000 +0000
-+++ ncurses-6.1-20190720/ncurses/base/lib_screen.c	2019-07-20 20:23:21.000000000 +0000
-@@ -41,7 +41,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_screen.c,v 1.95 2019/05/04 20:31:31 tom Exp $")
-+MODULE_ID("$Id: lib_screen.c,v 1.96 2019/07/20 20:23:21 tom Exp $")
- 
- #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
- 
-@@ -514,13 +514,13 @@
-      * Read the first 4 bytes to determine first if this is an old-format
-      * screen-dump, or new-format.
-      */
--    if (read_block(&tmp, 4, filep) < 0) {
-+    if (read_block(&tmp, (size_t) 4, filep) < 0) {
- 	returnWin(0);
-     }
-     /*
-      * If this is a new-format file, and we do not support it, give up.
-      */
--    if (!memcmp(&tmp, my_magic, 4)) {
-+    if (!memcmp(&tmp, my_magic, (size_t) 4)) {
- #if NCURSES_EXT_PUTWIN
- 	if (read_win(&tmp, filep) < 0)
- #endif
-@@ -823,7 +823,7 @@
- 	    attr_t attr;
- 
- 	    *buffer = '\0';
--	    if (!strncmp(name, "_pad.", 5) && !(win->_flags & _ISPAD)) {
-+	    if (!strncmp(name, "_pad.", (size_t) 5) && !(win->_flags & _ISPAD)) {
- 		continue;
- 	    }
- 	    switch (scr_params[y].type) {
-Index: ncurses/tinfo/make_hash.c
-Prereq:  1.26 
---- ncurses-6.1-20190713+/ncurses/tinfo/make_hash.c	2019-03-10 01:10:15.000000000 +0000
-+++ ncurses-6.1-20190720/ncurses/tinfo/make_hash.c	2019-07-20 20:14:46.000000000 +0000
-@@ -43,7 +43,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: make_hash.c,v 1.26 2019/03/10 01:10:15 tom Exp $")
-+MODULE_ID("$Id: make_hash.c,v 1.27 2019/07/20 20:14:46 tom Exp $")
- 
- /*
-  *	_nc_make_hash_table()
-@@ -222,16 +222,16 @@
- {
-     static char result[40];
-     unsigned n;
--    strcpy(result, L_PAREN);
-+    _nc_STRCPY(result, L_PAREN, sizeof(result));
-     for (n = 0; n < 3; ++n) {
- 	if ((1 << n) & type_mask) {
- 	    if (result[1])
--		strcat(result, "|");
--	    strcat(result, "1<<");
--	    strcat(result, typenames[n]);
-+		_nc_STRCAT(result, "|", sizeof(result));
-+	    _nc_STRCAT(result, "1<<", sizeof(result));
-+	    _nc_STRCAT(result, typenames[n], sizeof(result));
- 	}
-     }
--    strcat(result, R_PAREN);
-+    _nc_STRCAT(result, R_PAREN, sizeof(result));
-     return result;
- }
- 
-Index: ncurses/tinfo/read_entry.c
-Prereq:  1.154 
---- ncurses-6.1-20190713+/ncurses/tinfo/read_entry.c	2019-03-23 23:47:16.000000000 +0000
-+++ ncurses-6.1-20190720/ncurses/tinfo/read_entry.c	2019-07-20 20:23:11.000000000 +0000
-@@ -41,7 +41,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: read_entry.c,v 1.154 2019/03/23 23:47:16 tom Exp $")
-+MODULE_ID("$Id: read_entry.c,v 1.155 2019/07/20 20:23:11 tom Exp $")
- 
- #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
- 
-@@ -694,7 +694,7 @@
-     char *base = target;
-     int result = 0;
- 
--    if (!strncmp(source, "b64:", 4)) {
-+    if (!strncmp(source, "b64:", (size_t) 4)) {
- 	source += 4;
- 	while (*source != '\0') {
- 	    int bits[4];
-@@ -712,7 +712,7 @@
- 		}
- 	    }
- 	}
--    } else if (!strncmp(source, "hex:", 4)) {
-+    } else if (!strncmp(source, "hex:", (size_t) 4)) {
- 	source += 4;
- 	while (*source != '\0') {
- 	    int ch = decode_hex(&source);
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20190713+/package/debian-mingw/changelog	2019-07-13 20:42:44.000000000 +0000
-+++ ncurses-6.1-20190720/package/debian-mingw/changelog	2019-07-20 10:26:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190713) unstable; urgency=low
-+ncurses6 (6.1+20190720) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
-+ -- Thomas E. Dickey   Sat, 20 Jul 2019 06:26:30 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20190713+/package/debian-mingw64/changelog	2019-07-13 20:42:44.000000000 +0000
-+++ ncurses-6.1-20190720/package/debian-mingw64/changelog	2019-07-20 10:26:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190713) unstable; urgency=low
-+ncurses6 (6.1+20190720) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
-+ -- Thomas E. Dickey   Sat, 20 Jul 2019 06:26:30 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20190713+/package/debian/changelog	2019-07-13 20:42:44.000000000 +0000
-+++ ncurses-6.1-20190720/package/debian/changelog	2019-07-20 10:26:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190713) unstable; urgency=low
-+ncurses6 (6.1+20190720) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 13 Jul 2019 16:42:44 -0400
-+ -- Thomas E. Dickey   Sat, 20 Jul 2019 06:26:30 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.340 
---- ncurses-6.1-20190713+/package/mingw-ncurses.nsi	2019-07-13 20:42:44.000000000 +0000
-+++ ncurses-6.1-20190720/package/mingw-ncurses.nsi	2019-07-20 10:26:30.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.340 2019/07/13 20:42:44 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.342 2019/07/20 10:26:30 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "0713"
-+!define VERSION_MMDD  "0720"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20190713+/package/mingw-ncurses.spec	2019-07-13 20:42:44.000000000 +0000
-+++ ncurses-6.1-20190720/package/mingw-ncurses.spec	2019-07-20 10:26:30.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20190713
-+Release: 20190720
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20190713+/package/ncurses.spec	2019-07-13 20:42:44.000000000 +0000
-+++ ncurses-6.1-20190720/package/ncurses.spec	2019-07-20 10:26:30.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20190713
-+Release: 20190720
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20190713+/package/ncursest.spec	2019-07-13 20:42:44.000000000 +0000
-+++ ncurses-6.1-20190720/package/ncursest.spec	2019-07-20 10:26:30.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20190713
-+Release: 20190720
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20190727.patch b/ncurses-6.1-20190727.patch
deleted file mode 100644
index d5410df..0000000
--- a/ncurses-6.1-20190727.patch
+++ /dev/null
@@ -1,4133 +0,0 @@
-# ncurses 6.1 - patch 20190727 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190727.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Jul 28 00:01:44 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                                  |    6 
-# VERSION                               |    2 
-# dist.mk                               |    4 
-# doc/html/ada/funcs/T.htm              |    2 
-# doc/html/man/adacurses6-config.1.html |    2 
-# doc/html/man/captoinfo.1m.html        |    2 
-# doc/html/man/clear.1.html             |    2 
-# doc/html/man/form.3x.html             |    2 
-# doc/html/man/infocmp.1m.html          |    2 
-# doc/html/man/infotocap.1m.html        |    2 
-# doc/html/man/menu.3x.html             |    2 
-# doc/html/man/ncurses.3x.html          |    2 
-# doc/html/man/ncurses6-config.1.html   |    2 
-# doc/html/man/panel.3x.html            |    2 
-# doc/html/man/tabs.1.html              |    2 
-# doc/html/man/terminfo.5.html          | 1192 ++++++++++++++++----------------
-# doc/html/man/tic.1m.html              |    2 
-# doc/html/man/toe.1m.html              |    2 
-# doc/html/man/tput.1.html              |    2 
-# doc/html/man/tset.1.html              |    2 
-# doc/html/ncurses-intro.html           |  379 ++++++----
-# doc/ncurses-intro.doc                 |   36 
-# include/Caps                          |   10 
-# include/Caps.aix4                     |   10 
-# include/Caps.hpux11                   |   10 
-# include/Caps.keys                     |   10 
-# include/Caps.osf1r5                   |   10 
-# include/Caps.uwin                     |   10 
-# man/manhtml.externs                   |    5 
-# man/terminfo.head                     |   19 
-# ncurses-6.1-20190727/progs/ktrace.out |binary
-# ncurses/tinfo/add_tries.c             |    5 
-# ncurses/tinfo/make_hash.c             |   10 
-# package/debian-mingw/changelog        |    4 
-# package/debian-mingw64/changelog      |    4 
-# package/debian/changelog              |    4 
-# package/mingw-ncurses.nsi             |    4 
-# package/mingw-ncurses.spec            |    2 
-# package/ncurses.spec                  |    2 
-# package/ncursest.spec                 |    2 
-# progs/tic.c                           |   14 
-# 41 files changed, 968 insertions(+), 818 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3351 
---- ncurses-6.1-20190720+/NEWS	2019-07-21 00:33:00.000000000 +0000
-+++ ncurses-6.1-20190727/NEWS	2019-07-27 22:45:29.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3351 2019/07/21 00:33:00 tom Exp $
-+-- $Id: NEWS,v 1.3354 2019/07/27 22:45:29 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,10 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20190727
-+	+ fix a few coverity warnings.
-+	+ documentation updates based on tctest.
-+
- 20190720
- 	+ fix a few warnings for gcc 4.x
- 	+ add some portability/historical details to the tic, toe and infocmp
-Index: VERSION
---- ncurses-6.1-20190720+/VERSION	2019-07-20 10:26:30.000000000 +0000
-+++ ncurses-6.1-20190727/VERSION	2019-07-26 23:10:14.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20190720
-+5:0:10	6.1	20190727
-Index: dist.mk
-Prereq:  1.1296 
---- ncurses-6.1-20190720+/dist.mk	2019-07-20 10:26:30.000000000 +0000
-+++ ncurses-6.1-20190727/dist.mk	2019-07-26 23:10:14.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1296 2019/07/20 10:26:30 tom Exp $
-+# $Id: dist.mk,v 1.1297 2019/07/26 23:10:14 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20190720
-+NCURSES_PATCH = 20190727
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/ada/funcs/T.htm
---- ncurses-6.1-20190720+/doc/html/ada/funcs/T.htm	2019-07-13 23:50:38.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/ada/funcs/T.htm	2019-07-26 23:48:31.000000000 +0000
-@@ -20,8 +20,8 @@
- 
  • tgetnum
- 
  • tgetstr -  terminal_interface-curses-termcap.adb:108
- 
  • tgetstr -  terminal_interface-curses-termcap.adb:129
--
  • tgoto
- 
  • TGoto
-+
  • tgoto
- 
  • tigetflag
- 
  • tigetstr -  terminal_interface-curses-terminfo.adb:87
- 
  • tigetstr -  terminal_interface-curses-terminfo.adb:108
-Index: doc/html/man/adacurses6-config.1.html
---- ncurses-6.1-20190720+/doc/html/man/adacurses6-config.1.html	2019-07-20 18:53:10.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/adacurses6-config.1.html	2019-07-26 23:48:24.000000000 +0000
-@@ -125,7 +125,7 @@
-

    • SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20190720+/doc/html/man/captoinfo.1m.html	2019-07-20 18:53:10.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/captoinfo.1m.html	2019-07-26 23:48:24.000000000 +0000
-@@ -190,7 +190,7 @@
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/clear.1.html
---- ncurses-6.1-20190720+/doc/html/man/clear.1.html	2019-07-20 18:53:10.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/clear.1.html	2019-07-26 23:48:24.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.1-20190720+/doc/html/man/form.3x.html	2019-07-20 18:53:12.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/form.3x.html	2019-07-26 23:48:27.000000000 +0000
-@@ -246,7 +246,7 @@
-        curses(3x)  and  related  pages  whose names begin "form_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.1-20190720+/doc/html/man/infocmp.1m.html	2019-07-20 18:53:13.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/infocmp.1m.html	2019-07-26 23:48:28.000000000 +0000
-@@ -512,7 +512,7 @@
- 
-        https://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/infotocap.1m.html
---- ncurses-6.1-20190720+/doc/html/man/infotocap.1m.html	2019-07-20 18:53:13.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/infotocap.1m.html	2019-07-26 23:48:28.000000000 +0000
-@@ -85,7 +85,7 @@
-

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/menu.3x.html
---- ncurses-6.1-20190720+/doc/html/man/menu.3x.html	2019-07-20 18:53:13.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/menu.3x.html	2019-07-26 23:48:28.000000000 +0000
-@@ -221,7 +221,7 @@
-        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.1-20190720+/doc/html/man/ncurses.3x.html	2019-07-20 18:53:14.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/ncurses.3x.html	2019-07-26 23:48:29.000000000 +0000
-@@ -59,7 +59,7 @@
-        method of updating  character  screens  with  reasonable  optimization.
-        This  implementation  is  "new  curses"  (ncurses)  and is the approved
-        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
-        The  ncurses  library emulates the curses library of System V Release 4
-        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-Index: doc/html/man/ncurses6-config.1.html
---- ncurses-6.1-20190720+/doc/html/man/ncurses6-config.1.html	2019-07-20 18:53:14.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/ncurses6-config.1.html	2019-07-26 23:48:29.000000000 +0000
-@@ -112,7 +112,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.1-20190720+/doc/html/man/panel.3x.html	2019-07-20 18:53:14.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/panel.3x.html	2019-07-26 23:48:29.000000000 +0000
-@@ -204,7 +204,7 @@
-

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/tabs.1.html
---- ncurses-6.1-20190720+/doc/html/man/tabs.1.html	2019-07-20 18:53:15.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/tabs.1.html	2019-07-26 23:48:29.000000000 +0000
-@@ -205,7 +205,7 @@
-

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.1-20190720+/doc/html/man/terminfo.5.html	2019-07-20 18:53:15.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/terminfo.5.html	2019-07-27 20:27:54.000000000 +0000
-@@ -31,7 +31,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp @
-+  * @Id: terminfo.head,v 1.38 2019/07/27 11:51:04 tom Exp @
-   * Head of terminfo man page ends here
-   ****************************************************************************
-   * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
-@@ -94,60 +94,65 @@
- 
-

    DESCRIPTION

    -        Terminfo  is  a data base describing terminals, used by screen-oriented
--       programs such as nvi(1), rogue(1) and  libraries  such  as  curses(3x).
-+       programs such as nvi(1), lynx(1), mutt(1), and  other  curses  applica-
-+       tions,  using  high-level calls to libraries such as curses(3x).  It is
-+       also used via low-level calls by non-curses applications which  may  be
-+       screen-oriented (such as clear(1)) or non-screen (such as tabs(1)).
-+
-        Terminfo describes terminals by giving a set of capabilities which they
-        have, by specifying how to perform screen operations, and by specifying
--       padding  requirements  and  initialization  sequences.   This describes
--       ncurses version 6.1 (patch 20190720).
-+       padding requirements and initialization sequences.
-+
-+       This manual describes ncurses version 6.1 (patch 20190727).
- 
- 
-

    Terminfo Entry Syntax

    -        Entries in terminfo consist of a sequence of fields:
- 
--       o   Each field ends with a comma "," (embedded commas  may  be  escaped
-+       o   Each  field  ends  with a comma "," (embedded commas may be escaped
-            with a backslash or written as "\054").
- 
-        o   White space between fields is ignored.
- 
-        o   The first field in a terminfo entry begins in the first column.
- 
--       o   Newlines  and  leading  whitespace (spaces or tabs) may be used for
--           formatting entries for readability.  These are removed from  parsed
-+       o   Newlines and leading whitespace (spaces or tabs) may  be  used  for
-+           formatting  entries for readability.  These are removed from parsed
-            entries.
- 
--           The  infocmp  -f and -W options rely on this to format if-then-else
--           expressions, or to enforce maximum line-width.  The resulting  for-
-+           The infocmp -f and -W options rely on this to  format  if-then-else
-+           expressions,  or to enforce maximum line-width.  The resulting for-
-            matted terminal description can be read by tic.
- 
--       o   The  first  field for each terminal gives the names which are known
-+       o   The first field for each terminal gives the names which  are  known
-            for the terminal, separated by "|" characters.
- 
-            The first name given is the most common abbreviation for the termi-
--           nal  (its  primary name), the last name given should be a long name
--           fully identifying the terminal (see longname(3x)), and  all  others
-+           nal (its primary name), the last name given should be a  long  name
-+           fully  identifying  the terminal (see longname(3x)), and all others
-            are treated as synonyms (aliases) for the primary terminal name.
- 
--           X/Open  Curses  advises  that  all  names but the last should be in
--           lower case and contain no blanks; the last name  may  well  contain
-+           X/Open Curses advises that all names but  the  last  should  be  in
-+           lower  case  and  contain no blanks; the last name may well contain
-            upper case and blanks for readability.
- 
--           This  implementation  is not so strict; it allows mixed case in the
-+           This implementation is not so strict; it allows mixed case  in  the
-            primary name and aliases.  If the last name has no embedded blanks,
--           it  allows  that  to  be both an alias and a verbose name (but will
-+           it allows that to be both an alias and a  verbose  name  (but  will
-            warn about this ambiguity).
- 
--       o   Lines beginning with a "#" in the first column are treated as  com-
-+       o   Lines  beginning with a "#" in the first column are treated as com-
-            ments.
- 
-            While comment lines are legal at any point, the output of captoinfo
--           and infotocap (aliases for tic) will move comments  so  they  occur
-+           and  infotocap  (aliases  for tic) will move comments so they occur
-            only between entries.
- 
--       Terminal  names  (except  for the last, verbose entry) should be chosen
-+       Terminal names (except for the last, verbose entry)  should  be  chosen
-        using the following conventions.  The particular piece of hardware mak-
--       ing  up the terminal should have a root name, thus "hp2621".  This name
-+       ing up the terminal should have a root name, thus "hp2621".  This  name
-        should not contain hyphens.  Modes that the hardware can be in, or user
--       preferences,  should be indicated by appending a hyphen and a mode suf-
-+       preferences, should be indicated by appending a hyphen and a mode  suf-
-        fix.  Thus, a vt100 in 132-column mode would be vt100-w.  The following
-        suffixes should be used where possible:
- 
-@@ -170,96 +175,96 @@
- 
- 
-

    Terminfo Capabilities Syntax

    --       The  terminfo  entry  consists  of several capabilities, i.e., features
--       that the terminal has, or methods for exercising  the  terminal's  fea-
-+       The terminfo entry consists of  several  capabilities,  i.e.,  features
-+       that  the  terminal  has, or methods for exercising the terminal's fea-
-        tures.
- 
-        After the first field (giving the name(s) of the terminal entry), there
-        should be one or more capability fields.  These are boolean, numeric or
-        string names with corresponding values:
- 
--       o   Boolean  capabilities  are  true  when  present, false when absent.
-+       o   Boolean capabilities are true  when  present,  false  when  absent.
-            There is no explicit value for boolean capabilities.
- 
--       o   Numeric capabilities  have  a  "#"  following  the  name,  then  an
-+       o   Numeric  capabilities  have  a  "#"  following  the  name,  then an
-            unsigned decimal integer value.
- 
--       o   String  capabilities  have a "=" following the name, then an string
-+       o   String capabilities have a "=" following the name, then  an  string
-            of characters making up the capability value.
- 
--           String capabilities can be split into multiple lines, just  as  the
--           fields  comprising  a  terminal  entry  can  be split into multiple
--           lines.  While blanks between fields are  ignored,  blanks  embedded
--           within  a string value are retained, except for leading blanks on a
-+           String  capabilities  can be split into multiple lines, just as the
-+           fields comprising a terminal  entry  can  be  split  into  multiple
-+           lines.   While  blanks  between fields are ignored, blanks embedded
-+           within a string value are retained, except for leading blanks on  a
-            line.
- 
--       Any capability can be canceled,  i.e.,  suppressed  from  the  terminal
-+       Any  capability  can  be  canceled,  i.e., suppressed from the terminal
-        entry, by following its name with "@" rather than a capability value.
- 
- 
-

    Similar Terminals

    --       If  there  are  two  very  similar  terminals, one (the variant) can be
--       defined as being just like the other (the  base)  with  certain  excep-
-+       If there are two very similar  terminals,  one  (the  variant)  can  be
-+       defined  as  being  just  like the other (the base) with certain excep-
-        tions.  In the definition of the variant, the string capability use can
-        be given with the name of the base terminal:
- 
--       o   The capabilities given before use override those in the  base  type
-+       o   The  capabilities  given before use override those in the base type
-            named by use.
- 
--       o   If  there are multiple use capabilities, they are merged in reverse
--           order.  That is, the rightmost use reference  is  processed  first,
-+       o   If there are multiple use capabilities, they are merged in  reverse
-+           order.   That  is,  the rightmost use reference is processed first,
-            then the one to its left, and so forth.
- 
--       o   Capabilities  given  explicitly in the entry override those brought
-+       o   Capabilities given explicitly in the entry override  those  brought
-            in by use references.
- 
-        A capability can be canceled by placing xx@ to the left of the use ref-
--       erence  that  imports it, where xx is the capability.  For example, the
-+       erence that imports it, where xx is the capability.  For  example,  the
-        entry
- 
-               2621-nl, smkx@, rmkx@, use=2621,
- 
-        defines a 2621-nl that does not have the smkx or rmkx capabilities, and
--       hence  does  not  turn  on the function key labels when in visual mode.
--       This is useful for different modes for a  terminal,  or  for  different
-+       hence does not turn on the function key labels  when  in  visual  mode.
-+       This  is  useful  for  different modes for a terminal, or for different
-        user preferences.
- 
-        An entry included via use can contain canceled capabilities, which have
--       the same effect as if those cancels were inline in the  using  terminal
-+       the  same  effect as if those cancels were inline in the using terminal
-        entry.
- 
- 
-

    Predefined Capabilities

    --       The  following  is  a  complete table of the capabilities included in a
--       terminfo description block and available to  terminfo-using  code.   In
-+       The following is a complete table of the  capabilities  included  in  a
-+       terminfo  description  block  and available to terminfo-using code.  In
-        each line of the table,
- 
--       The  variable  is  the  name  by  which the programmer (at the terminfo
-+       The variable is the name by  which  the  programmer  (at  the  terminfo
-        level) accesses the capability.
- 
--       The capname is the short name used in the text of the database, and  is
--       used  by  a  person updating the database.  Whenever possible, capnames
-+       The  capname is the short name used in the text of the database, and is
-+       used by a person updating the database.   Whenever  possible,  capnames
-        are chosen to be the same as or similar to the ANSI X3.64-1979 standard
--       (now  superseded  by  ECMA-48,  which  uses  identical  or very similar
--       names).  Semantics are also intended to match those of  the  specifica-
-+       (now superseded by  ECMA-48,  which  uses  identical  or  very  similar
-+       names).   Semantics  are also intended to match those of the specifica-
-        tion.
- 
--       The  termcap code is the old termcap capability name (some capabilities
-+       The termcap code is the old termcap capability name (some  capabilities
-        are new, and have names which termcap did not originate).
- 
--       Capability names have no hard length limit, but an informal limit of  5
-+       Capability  names have no hard length limit, but an informal limit of 5
-        characters has been adopted to keep them short and to allow the tabs in
-        the source file Caps to line up nicely.
- 
--       Finally, the description field attempts to convey the semantics of  the
-+       Finally,  the description field attempts to convey the semantics of the
-        capability.  You may find some codes in the description field:
- 
-        (P)    indicates that padding may be specified
- 
--       #[1-9] in  the  description  field  indicates that the string is passed
-+       #[1-9] in the description field indicates that  the  string  is  passed
-               through tparm with parms as given (#i).
- 
--       (P*)   indicates that padding may vary in proportion to the  number  of
-+       (P*)   indicates  that  padding may vary in proportion to the number of
-               lines affected
- 
-        (#i)   indicates the ith parameter.
-@@ -276,6 +281,9 @@
-                                                        matic margins
-           back_color_erase            bce       ut     screen erased with
-                                                        background color
-+
-+
-+
-           can_change                  ccc       cc     terminal can re-
-                                                        define existing col-
-                                                        ors
-@@ -283,7 +291,6 @@
-                                                        by overwriting (hp)
-           col_addr_glitch             xhpa      YA     only positive motion
-                                                        for hpa/mhpa caps
--
-           cpi_changes_res             cpix      YF     changing character
-                                                        pitch changes reso-
-                                                        lution
-@@ -342,14 +349,13 @@
-                                                        echo on screen
-           row_addr_glitch             xvpa      YD     only positive motion
-                                                        for vpa/mvpa caps
-+
-           semi_auto_right_margin      sam       YE     printing in last
-                                                        column causes cr
-           status_line_esc_ok          eslok     es     escape can be used
-                                                        on the status line
-           tilde_glitch                hz        hz     cannot print ~'s
-                                                        (Hazeltine)
--
--
-           transparent_underline       ul        ul     underline character
-                                                        overstrikes
-           xon_xoff                    xon       xo     terminal uses
-@@ -396,8 +402,8 @@
-           width_status_line           wsl       ws     number of columns in
-                                                        status line
- 
--       The following numeric capabilities  are  present  in  the  SVr4.0  term
--       structure,  but  are  not yet documented in the man page.  They came in
-+       The  following  numeric  capabilities  are  present  in the SVr4.0 term
-+       structure, but are not yet documented in the man page.   They  came  in
-        with SVr4's printer support.
- 
- 
-@@ -407,6 +413,9 @@
-                                                        each bit-image row
-           bit_image_type              bitype    Yp     type of bit-image
-                                                        device
-+
-+
-+
-           buffer_capacity             bufsz     Ya     numbers of bytes
-                                                        buffered before
-                                                        printing
-@@ -415,7 +424,6 @@
-           dot_horz_spacing            spinh     Yc     spacing of dots hor-
-                                                        izontally in dots
-                                                        per inch
--
-           dot_vert_spacing            spinv     Yb     spacing of pins ver-
-                                                        tically in pins per
-                                                        inch
-@@ -472,6 +480,8 @@
-                                                        (P)
-           char_padding                rmp       rP     like ip but when in
-                                                        insert mode
-+
-+
-           clear_all_tabs              tbc       ct     clear all tab stops
-                                                        (P)
-           clear_margins               mgc       MC     clear right and left
-@@ -480,8 +490,6 @@
-                                                        home cursor (P*)
-           clr_bol                     el1       cb     Clear to beginning
-                                                        of line
--
--
-           clr_eol                     el        ce     clear to end of line
-                                                        (P)
-           clr_eos                     ed        cd     clear to end of
-@@ -539,6 +547,7 @@
-           enter_delete_mode           smdc      dm     enter delete mode
-           enter_dim_mode              dim       mh     turn on half-bright
-                                                        mode
-+
-           enter_doublewide_mode       swidm     ZF     Enter double-wide
-                                                        mode
-           enter_draft_quality         sdrfq     ZG     Enter draft-quality
-@@ -547,7 +556,6 @@
-           enter_italics_mode          sitm      ZH     Enter italic mode
-           enter_leftward_mode         slm       ZI     Start leftward car-
-                                                        riage motion
--
-           enter_micro_mode            smicm     ZJ     Start micro-motion
-                                                        mode
-           enter_near_letter_quality   snlq      ZK     Enter NLQ mode
-@@ -605,6 +613,7 @@
-                                                        not move cursor)
-           form_feed                   ff        ff     hardcopy terminal
-                                                        page eject (P*)
-+
-           from_status_line            fsl       fs     return from status
-                                                        line
-           goto_window                 wingo     WG     go to window #1
-@@ -613,7 +622,6 @@
-                                                        string
-           init_2string                is2       is     initialization
-                                                        string
--
-           init_3string                is3       i3     initialization
-                                                        string
-           init_file                   if        if     name of initializa-
-@@ -671,6 +679,7 @@
-           key_f15                     kf15      F5     F15 function key
-           key_f16                     kf16      F6     F16 function key
-           key_f17                     kf17      F7     F17 function key
-+
-           key_f18                     kf18      F8     F18 function key
-           key_f19                     kf19      F9     F19 function key
-           key_f2                      kf2       k2     F2 function key
-@@ -679,7 +688,6 @@
-           key_f22                     kf22      FC     F22 function key
-           key_f23                     kf23      FD     F23 function key
-           key_f24                     kf24      FE     F24 function key
--
-           key_f25                     kf25      FF     F25 function key
-           key_f26                     kf26      FG     F26 function key
-           key_f27                     kf27      FH     F27 function key
-@@ -737,6 +745,7 @@
-           key_mark                    kmrk      %2     mark key
-           key_message                 kmsg      %3     message key
-           key_move                    kmov      %4     move key
-+
-           key_next                    knxt      %5     next key
-           key_npage                   knp       kN     next-page key
-           key_open                    kopn      %6     open key
-@@ -745,7 +754,6 @@
-           key_previous                kprv      %8     previous key
-           key_print                   kprt      %9     print key
-           key_redo                    krdo      %0     redo key
--
-           key_reference               kref      &1     reference key
-           key_refresh                 krfr      &2     refresh key
-           key_replace                 krpl      &3     replace key
-@@ -802,6 +810,8 @@
-                                                        key f0 if not f0
-           lab_f1                      lf1       l1     label on function
-                                                        key f1 if not f1
-+
-+
-           lab_f10                     lf10      la     label on function
-                                                        key f10 if not f10
-           lab_f2                      lf2       l2     label on function
-@@ -810,8 +820,6 @@
-                                                        key f3 if not f3
-           lab_f4                      lf4       l4     label on function
-                                                        key f4 if not f4
--
--
-           lab_f5                      lf5       l5     label on function
-                                                        key f5 if not f5
-           lab_f6                      lf6       l6     label on function
-@@ -869,6 +877,7 @@
-                                                        to the right (P*)
-           parm_right_micro            mcuf      Zh     Like parm_right_cur-
-                                                        sor in micro mode
-+
-           parm_rindex                 rin       SR     scroll back #1 lines
-                                                        (P)
-           parm_up_cursor              cuu       UP     up #1 lines (P*)
-@@ -876,8 +885,6 @@
-                                                        in micro mode
-           pkey_key                    pfkey     pk     program function key
-                                                        #1 to type string #2
--
--
-           pkey_local                  pfloc     pl     program function key
-                                                        #1 to execute string
-                                                        #2
-@@ -932,6 +939,11 @@
-                                                        pair to #1
-           set_foreground              setf      Sf     Set foreground color
-                                                        #1
-+
-+
-+
-+
-+
-           set_left_margin             smgl      ML     set left soft margin
-                                                        at current col-
-                                                        umn.     See smgl.
-@@ -942,8 +954,6 @@
-           set_right_margin            smgr      MR     set right soft mar-
-                                                        gin at current col-
-                                                        umn
--
--
-           set_right_margin_parm       smgrp     Zn     Set right margin at
-                                                        column #1
-           set_tab                     hts       st     set a tab in every
-@@ -1008,8 +1018,6 @@
-                                                         lation
-           bit_image_carriage_return   bicr       Yv     Move to beginning
-                                                         of same row
--
--
-           bit_image_newline           binel      Zz     Move to next row
-                                                         of the bit image
-           bit_image_repeat            birep      Xy     Repeat bit image
-@@ -1067,6 +1075,7 @@
-           set_a_foreground            setaf      AF     Set foreground
-                                                         color to #1, using
-                                                         ANSI escape
-+
-           set_color_band              setcolor   Yz     Change to ribbon
-                                                         color #1
-           set_lr_margin               smglr      ML     Set both left and
-@@ -1074,19 +1083,17 @@
-                                                         #1, #2.  (ML is
-                                                         not in BSD term-
-                                                         cap).
--
--
-           set_page_length             slines     YZ     Set page length to
-                                                         #1 lines
-           set_tb_margin               smgtb      MT     Sets both top and
-                                                         bottom margins to
-                                                         #1, #2
- 
--        The XSI Curses standard added these hardcopy capabilities.  They  were
--        used  in  some post-4.1 versions of System V curses, e.g., Solaris 2.5
--        and IRIX 6.x.  Except for YI, the ncurses termcap names for  them  are
--        invented.   According to the XSI Curses standard, they have no termcap
--        names.  If your compiled terminfo entries use these, they may  not  be
-+        The  XSI Curses standard added these hardcopy capabilities.  They were
-+        used in some post-4.1 versions of System V curses, e.g.,  Solaris  2.5
-+        and  IRIX  6.x.  Except for YI, the ncurses termcap names for them are
-+        invented.  According to the XSI Curses standard, they have no  termcap
-+        names.   If  your compiled terminfo entries use these, they may not be
-         binary-compatible with System V terminfo entries after SVr4.1; beware!
- 
- 
-@@ -1115,26 +1122,26 @@
- 
- 
-

    User-Defined Capabilities

    --       The  preceding  section  listed the predefined capabilities.  They deal
--       with some special features for terminals no longer (or possibly  never)
--       produced.   Occasionally  there are special features of newer terminals
--       which are awkward or impossible to represent by reusing the  predefined
-+       The preceding section listed the predefined  capabilities.   They  deal
-+       with  some special features for terminals no longer (or possibly never)
-+       produced.  Occasionally there are special features of  newer  terminals
-+       which  are awkward or impossible to represent by reusing the predefined
-        capabilities.
- 
--       ncurses  addresses  this  limitation by allowing user-defined capabili-
-+       ncurses addresses this limitation by  allowing  user-defined  capabili-
-        ties.  The tic and infocmp programs provide the -x option for this pur-
-        pose.  When -x is set, tic treats unknown capabilities as user-defined.
--       That is, if tic encounters a capability name which it does  not  recog-
--       nize,  it  infers  its type (boolean, number or string) from the syntax
--       and  makes  an  extended  table  entry  for   that   capability.    The
--       use_extended_names(3x)  function  makes  this information conditionally
-+       That  is,  if tic encounters a capability name which it does not recog-
-+       nize, it infers its type (boolean, number or string)  from  the  syntax
-+       and   makes   an   extended  table  entry  for  that  capability.   The
-+       use_extended_names(3x) function makes  this  information  conditionally
-        available to applications.  The ncurses library provides the data leav-
-        ing most of the behavior to applications:
- 
--       o   User-defined  capability  strings  whose  name  begins with "k" are
-+       o   User-defined capability strings whose  name  begins  with  "k"  are
-            treated as function keys.
- 
--       o   The types (boolean,  number,  string)  determined  by  tic  can  be
-+       o   The  types  (boolean,  number,  string)  determined  by  tic can be
-            inferred by successful calls on tigetflag, etc.
- 
-        o   If the capability name happens to be two characters, the capability
-@@ -1142,18 +1149,18 @@
- 
-        While termcap is said to be extensible because it does not use a prede-
-        fined set of capabilities, in practice it has been limited to the capa-
--       bilities defined by terminfo implementations.  As a rule,  user-defined
-+       bilities  defined by terminfo implementations.  As a rule, user-defined
-        capabilities intended for use by termcap applications should be limited
--       to booleans and numbers to avoid  running  past  the  1023  byte  limit
-+       to  booleans  and  numbers  to  avoid  running past the 1023 byte limit
-        assumed by termcap implementations and their applications.  In particu-
--       lar, providing extended sets of function keys  (past  the  60  numbered
--       keys  and  the  handful  of  special named keys) is best done using the
-+       lar,  providing  extended  sets  of function keys (past the 60 numbered
-+       keys and the handful of special named keys)  is  best  done  using  the
-        longer names available using terminfo.
- 
- 
-

    A Sample Entry

    -        The following entry, describing an ANSI-standard terminal, is represen-
--       tative  of  what a terminfo entry for a modern terminal typically looks
-+       tative of what a terminfo entry for a modern terminal  typically  looks
-        like.
- 
-        ansi|ansi/pc-term compatible with color,
-@@ -1187,8 +1194,8 @@
-                smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n,
-                u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%i%p1%dd,
- 
--       Entries may continue onto multiple lines by placing white space at  the
--       beginning  of  each line except the first.  Comments may be included on
-+       Entries  may continue onto multiple lines by placing white space at the
-+       beginning of each line except the first.  Comments may be  included  on
-        lines beginning with "#".  Capabilities in terminfo are of three types:
- 
-        o   Boolean capabilities which indicate that the terminal has some par-
-@@ -1197,23 +1204,23 @@
-        o   numeric capabilities giving the size of the terminal or the size of
-            particular delays, and
- 
--       o   string capabilities, which give a sequence which  can  be  used  to
-+       o   string  capabilities,  which  give  a sequence which can be used to
-            perform particular terminal operations.
- 
- 
-

    Types of Capabilities

    -        All capabilities have names.  For instance, the fact that ANSI-standard
--       terminals have automatic margins (i.e., an automatic return  and  line-
--       feed  when the end of a line is reached) is indicated by the capability
--       am.  Hence the description of ansi includes am.   Numeric  capabilities
--       are  followed  by  the  character  "#" and then a positive value.  Thus
-+       terminals  have  automatic margins (i.e., an automatic return and line-
-+       feed when the end of a line is reached) is indicated by the  capability
-+       am.   Hence  the description of ansi includes am.  Numeric capabilities
-+       are followed by the character "#" and  then  a  positive  value.   Thus
-        cols, which indicates the number of columns the terminal has, gives the
--       value  "80" for ansi.  Values for numeric capabilities may be specified
-+       value "80" for ansi.  Values for numeric capabilities may be  specified
-        in decimal, octal or hexadecimal, using the C programming language con-
-        ventions (e.g., 255, 0377 and 0xff or 0xFF).
- 
--       Finally,  string  valued capabilities, such as el (clear to end of line
--       sequence) are given by the two-character  code,  an  "=",  and  then  a
-+       Finally, string valued capabilities, such as el (clear to end  of  line
-+       sequence)  are  given  by  the  two-character  code, an "=", and then a
-        string ending at the next following ",".
- 
-        A number of escape sequences are provided in the string valued capabil-
-@@ -1234,9 +1241,9 @@
-            respectively.
- 
-        X/Open Curses does not say what "appropriate x" might be.  In practice,
--       that  is a printable ASCII graphic character.  The special case "^?" is
--       interpreted as DEL (127).  In all other cases, the character  value  is
--       AND'd  with 0x1f, mapping to ASCII control codes in the range 0 through
-+       that is a printable ASCII graphic character.  The special case "^?"  is
-+       interpreted  as  DEL (127).  In all other cases, the character value is
-+       AND'd with 0x1f, mapping to ASCII control codes in the range 0  through
-        31.
- 
-        Other escapes include
-@@ -1252,142 +1259,142 @@
-        o   and \0 for null.
- 
-            \0 will produce \200, which does not terminate a string but behaves
--           as  a null character on most terminals, providing CS7 is specified.
-+           as a null character on most terminals, providing CS7 is  specified.
-            See stty(1).
- 
--           The reason for this quirk is to maintain  binary  compatibility  of
--           the  compiled  terminfo files with other implementations, e.g., the
--           SVr4 systems, which document this.   Compiled  terminfo  files  use
--           null-terminated  strings,  with  no  lengths.  Modifying this would
-+           The  reason  for  this quirk is to maintain binary compatibility of
-+           the compiled terminfo files with other implementations,  e.g.,  the
-+           SVr4  systems,  which  document  this.  Compiled terminfo files use
-+           null-terminated strings, with no  lengths.   Modifying  this  would
-            require a new binary format, which would not work with other imple-
-            mentations.
- 
-        Finally, characters may be given as three octal digits after a \.
- 
--       A  delay  in  milliseconds  may appear anywhere in a string capability,
--       enclosed in $<..> brackets, as in el=\EK$<5>,  and  padding  characters
-+       A delay in milliseconds may appear anywhere  in  a  string  capability,
-+       enclosed  in  $<..>  brackets, as in el=\EK$<5>, and padding characters
-        are supplied by tputs(3x) to provide this delay.
- 
-        o   The delay must be a number with at most one decimal place of preci-
-            sion; it may be followed by suffixes "*" or "/" or both.
- 
--       o   A "*" indicates that the padding required is  proportional  to  the
--           number  of lines affected by the operation, and the amount given is
--           the per-affected-unit padding required.  (In  the  case  of  insert
-+       o   A  "*"  indicates  that the padding required is proportional to the
-+           number of lines affected by the operation, and the amount given  is
-+           the  per-affected-unit  padding  required.   (In the case of insert
-            character, the factor is still the number of lines affected.)
- 
-            Normally, padding is advisory if the device has the xon capability;
-            it is used for cost computation but does not trigger delays.
- 
--       o   A "/" suffix indicates that the padding is mandatory and  forces  a
-+       o   A  "/"  suffix indicates that the padding is mandatory and forces a
-            delay of the given number of milliseconds even on devices for which
-            xon is present to indicate flow control.
- 
--       Sometimes individual capabilities must be commented out.  To  do  this,
--       put  a  period before the capability name.  For example, see the second
-+       Sometimes  individual  capabilities must be commented out.  To do this,
-+       put a period before the capability name.  For example, see  the  second
-        ind in the example above.
- 
- 
-

    Fetching Compiled Descriptions

    --       The ncurses library  searches  for  terminal  descriptions  in  several
--       places.   It  uses only the first description found.  The library has a
--       compiled-in list of places to search which can be overridden  by  envi-
--       ronment  variables.   Before  starting  to  search,  ncurses eliminates
-+       The  ncurses  library  searches  for  terminal  descriptions in several
-+       places.  It uses only the first description found.  The library  has  a
-+       compiled-in  list  of places to search which can be overridden by envi-
-+       ronment variables.   Before  starting  to  search,  ncurses  eliminates
-        duplicates in its search list.
- 
--       o   If the environment variable TERMINFO is set, it is  interpreted  as
-+       o   If  the  environment variable TERMINFO is set, it is interpreted as
-            the pathname of a directory containing the compiled description you
-            are working on.  Only that directory is searched.
- 
--       o   If TERMINFO is not set, ncurses will instead look in the  directory
-+       o   If  TERMINFO is not set, ncurses will instead look in the directory
-            $HOME/.terminfo for a compiled description.
- 
--       o   Next,  if  the  environment  variable TERMINFO_DIRS is set, ncurses
--           will interpret the contents of that variable as a  list  of  colon-
-+       o   Next, if the environment variable  TERMINFO_DIRS  is  set,  ncurses
-+           will  interpret  the  contents of that variable as a list of colon-
-            separated directories (or database files) to be searched.
- 
--           An  empty directory name (i.e., if the variable begins or ends with
--           a colon, or contains adjacent colons) is interpreted as the  system
-+           An empty directory name (i.e., if the variable begins or ends  with
-+           a  colon, or contains adjacent colons) is interpreted as the system
-            location /usr/share/terminfo.
- 
-        o   Finally, ncurses searches these compiled-in locations:
- 
--           o   a    list    of    directories   (/usr/local/ncurses/share/ter-
-+           o   a   list    of    directories    (/usr/local/ncurses/share/ter-
-                minfo:/usr/share/terminfo), and
- 
--           o   the system terminfo directory,  /usr/share/terminfo  (the  com-
-+           o   the  system  terminfo  directory, /usr/share/terminfo (the com-
-                piled-in default).
- 
- 
-

    Preparing Descriptions

    --       We  now  outline  how  to  prepare descriptions of terminals.  The most
--       effective way to prepare a terminal description  is  by  imitating  the
--       description  of  a  similar  terminal  in  terminfo  and  to build up a
-+       We now outline how to prepare  descriptions  of  terminals.   The  most
-+       effective  way  to  prepare  a terminal description is by imitating the
-+       description of a similar  terminal  in  terminfo  and  to  build  up  a
-        description gradually, using partial descriptions with vi or some other
--       screen-oriented  program to check that they are correct.  Be aware that
--       a very unusual terminal may expose deficiencies in the ability  of  the
-+       screen-oriented program to check that they are correct.  Be aware  that
-+       a  very  unusual terminal may expose deficiencies in the ability of the
-        terminfo file to describe it or bugs in the screen-handling code of the
-        test program.
- 
--       To get the padding for insert line right (if the terminal  manufacturer
--       did  not  document  it)  a  severe test is to edit a large file at 9600
-+       To  get the padding for insert line right (if the terminal manufacturer
-+       did not document it) a severe test is to edit  a  large  file  at  9600
-        baud, delete 16 or so lines from the middle of the screen, then hit the
-        "u" key several times quickly.  If the terminal messes up, more padding
-        is usually needed.  A similar test can be used for insert character.
- 
- 
-

    Basic Capabilities

    --       The number of columns on each line for the terminal  is  given  by  the
--       cols  numeric capability.  If the terminal is a CRT, then the number of
--       lines on the screen is given by the lines capability.  If the  terminal
--       wraps  around  to  the  beginning  of the next line when it reaches the
--       right margin, then it should have the am capability.  If  the  terminal
--       can  clear  its  screen,  leaving the cursor in the home position, then
--       this is given by the clear string capability.  If  the  terminal  over-
--       strikes  (rather  than  clearing  a position when a character is struck
--       over) then it should have the os capability.   If  the  terminal  is  a
-+       The  number  of  columns  on each line for the terminal is given by the
-+       cols numeric capability.  If the terminal is a CRT, then the number  of
-+       lines  on the screen is given by the lines capability.  If the terminal
-+       wraps around to the beginning of the next  line  when  it  reaches  the
-+       right  margin,  then it should have the am capability.  If the terminal
-+       can clear its screen, leaving the cursor in  the  home  position,  then
-+       this  is  given  by the clear string capability.  If the terminal over-
-+       strikes (rather than clearing a position when  a  character  is  struck
-+       over)  then  it  should  have  the os capability.  If the terminal is a
-        printing terminal, with no soft copy unit, give it both hc and os.  (os
--       applies to storage scope terminals, such as TEKTRONIX 4010  series,  as
--       well  as  hard copy and APL terminals.)  If there is a code to move the
-+       applies  to  storage scope terminals, such as TEKTRONIX 4010 series, as
-+       well as hard copy and APL terminals.)  If there is a code to  move  the
-        cursor to the left edge of the current row, give this as cr.  (Normally
--       this  will  be carriage return, control/M.)  If there is a code to pro-
-+       this will be carriage return, control/M.)  If there is a code  to  pro-
-        duce an audible signal (bell, beep, etc) give this as bel.
- 
-        If there is a code to move the cursor one position to the left (such as
--       backspace)  that  capability should be given as cub1.  Similarly, codes
--       to move to the right, up, and down should be given as cuf1,  cuu1,  and
--       cud1.   These  local cursor motions should not alter the text they pass
--       over, for example, you would not  normally  use  "cuf1= "  because  the
-+       backspace) that capability should be given as cub1.   Similarly,  codes
-+       to  move  to the right, up, and down should be given as cuf1, cuu1, and
-+       cud1.  These local cursor motions should not alter the text  they  pass
-+       over,  for  example,  you  would  not normally use "cuf1= " because the
-        space would erase the character moved over.
- 
-        A very important point here is that the local cursor motions encoded in
--       terminfo are undefined at the left and top edges  of  a  CRT  terminal.
-+       terminfo  are  undefined  at  the left and top edges of a CRT terminal.
-        Programs should never attempt to backspace around the left edge, unless
--       bw is given, and never attempt to go up locally off the top.  In  order
--       to  scroll  text up, a program will go to the bottom left corner of the
-+       bw  is given, and never attempt to go up locally off the top.  In order
-+       to scroll text up, a program will go to the bottom left corner  of  the
-        screen and send the ind (index) string.
- 
--       To scroll text down, a program goes to  the  top  left  corner  of  the
-+       To  scroll  text  down,  a  program  goes to the top left corner of the
-        screen and sends the ri (reverse index) string.  The strings ind and ri
-        are undefined when not on their respective corners of the screen.
- 
--       Parameterized versions of the scrolling  sequences  are  indn  and  rin
--       which  have  the same semantics as ind and ri except that they take one
--       parameter, and scroll that many lines.  They are also undefined  except
-+       Parameterized  versions  of  the  scrolling  sequences are indn and rin
-+       which have the same semantics as ind and ri except that they  take  one
-+       parameter,  and scroll that many lines.  They are also undefined except
-        at the appropriate edge of the screen.
- 
--       The  am capability tells whether the cursor sticks at the right edge of
--       the screen when text is output, but this does not necessarily apply  to
--       a  cuf1  from  the last column.  The only local motion which is defined
--       from the left edge is if bw is given, then a cub1 from  the  left  edge
--       will  move  to the right edge of the previous row.  If bw is not given,
--       the effect is undefined.  This is useful for drawing a box  around  the
-+       The am capability tells whether the cursor sticks at the right edge  of
-+       the  screen when text is output, but this does not necessarily apply to
-+       a cuf1 from the last column.  The only local motion  which  is  defined
-+       from  the  left  edge is if bw is given, then a cub1 from the left edge
-+       will move to the right edge of the previous row.  If bw is  not  given,
-+       the  effect  is undefined.  This is useful for drawing a box around the
-        edge of the screen, for example.  If the terminal has switch selectable
--       automatic margins, the terminfo file usually assumes that this  is  on;
--       i.e.,  am.  If the terminal has a command which moves to the first col-
--       umn of the next line, that command can be given as nel  (newline).   It
--       does  not  matter  if  the  command clears the remainder of the current
--       line, so if the terminal has no cr and lf it may still be  possible  to
-+       automatic  margins,  the terminfo file usually assumes that this is on;
-+       i.e., am.  If the terminal has a command which moves to the first  col-
-+       umn  of  the next line, that command can be given as nel (newline).  It
-+       does not matter if the command clears  the  remainder  of  the  current
-+       line,  so  if the terminal has no cr and lf it may still be possible to
-        craft a working nel out of one or both of them.
- 
-        These capabilities suffice to describe hard-copy and "glass-tty" termi-
-@@ -1404,20 +1411,20 @@
- 
- 
-

    Parameterized Strings

    --       Cursor addressing and other strings requiring parameters in the  termi-
--       nal  are  described  by a parameterized string capability, with printf-
-+       Cursor  addressing and other strings requiring parameters in the termi-
-+       nal are described by a parameterized string  capability,  with  printf-
-        like escapes such as %x in it.  For example, to address the cursor, the
--       cup  capability  is  given, using two parameters: the row and column to
--       address to.  (Rows and columns are numbered from zero and refer to  the
-+       cup capability is given, using two parameters: the row  and  column  to
-+       address  to.  (Rows and columns are numbered from zero and refer to the
-        physical screen visible to the user, not to any unseen memory.)  If the
--       terminal has memory relative cursor addressing, that can  be  indicated
-+       terminal  has  memory relative cursor addressing, that can be indicated
-        by mrcup.
- 
--       The  parameter mechanism uses a stack and special % codes to manipulate
--       it.  Typically a sequence will push one  of  the  parameters  onto  the
--       stack  and  then print it in some format.  Print (e.g., "%d") is a spe-
-+       The parameter mechanism uses a stack and special % codes to  manipulate
-+       it.   Typically  a  sequence  will  push one of the parameters onto the
-+       stack and then print it in some format.  Print (e.g., "%d") is  a  spe-
-        cial case.  Other operations, including "%t" pop their operand from the
--       stack.   It  is noted that more complex operations are often necessary,
-+       stack.  It is noted that more complex operations are  often  necessary,
-        e.g., in the sgr string.
- 
-        The % encodings have the following meanings:
-@@ -1425,7 +1432,7 @@
-        %%   outputs "%"
- 
-        %[[:]flags][width[.precision]][doxXs]
--            as in printf(3), flags are [-+#] and space.  Use a  ":"  to  allow
-+            as  in  printf(3),  flags are [-+#] and space.  Use a ":" to allow
-             the next character to be a "-" flag, avoiding interpreting "%-" as
-             an operator.
- 
-@@ -1448,9 +1455,9 @@
-        %g[A-Z]
-             get static variable [a-z] and push it
- 
--            The terms "static" and "dynamic"  are  misleading.   Historically,
-+            The  terms  "static"  and "dynamic" are misleading.  Historically,
-             these are simply two different sets of variables, whose values are
--            not reset between calls to tparm(3x).  However, that fact  is  not
-+            not  reset  between calls to tparm(3x).  However, that fact is not
-             documented in other implementations.  Relying on it will adversely
-             impact portability to other implementations.
- 
-@@ -1480,8 +1487,8 @@
- 
-        %? expr %t thenpart %e elsepart %;
-             This forms an if-then-else.  The %e elsepart is optional.  Usually
--            the  %?  expr  part  pushes a value onto the stack, and %t pops it
--            from the stack, testing if it is nonzero (true).  If  it  is  zero
-+            the %? expr part pushes a value onto the stack,  and  %t  pops  it
-+            from  the  stack,  testing if it is nonzero (true).  If it is zero
-             (false), control passes to the %e (else) part.
- 
-             It is possible to form else-if's a la Algol 68:
-@@ -1489,245 +1496,245 @@
- 
-             where ci are conditions, bi are bodies.
- 
--            Use  the  -f  option of tic or infocmp to see the structure of if-
-+            Use the -f option of tic or infocmp to see the  structure  of  if-
-             then-else's.  Some strings, e.g., sgr can be very complicated when
--            written  on  one line.  The -f option splits the string into lines
-+            written on one line.  The -f option splits the string  into  lines
-             with the parts indented.
- 
--       Binary operations are in postfix form with the operands  in  the  usual
-+       Binary  operations  are  in postfix form with the operands in the usual
-        order.  That is, to get x-5 one would use "%gx%{5}%-".  %P and %g vari-
-        ables are persistent across escape-string evaluations.
- 
--       Consider the HP2645, which, to get to row 3 and column 12, needs to  be
--       sent  \E&a12c03Y padded for 6 milliseconds.  Note that the order of the
--       rows and columns is inverted here, and that  the  row  and  column  are
--       printed    as    two    digits.     Thus    its   cup   capability   is
-+       Consider  the HP2645, which, to get to row 3 and column 12, needs to be
-+       sent \E&a12c03Y padded for 6 milliseconds.  Note that the order of  the
-+       rows  and  columns  is  inverted  here, and that the row and column are
-+       printed   as   two   digits.     Thus    its    cup    capability    is
-        "cup=6\E&%p2%2dc%p1%2dY".
- 
--       The Microterm ACT-IV needs the current row and column sent preceded  by
--       a   ^T,   with   the   row   and   column  simply  encoded  in  binary,
--       "cup=^T%p1%c%p2%c".  Terminals which  use  "%c"  need  to  be  able  to
--       backspace  the cursor (cub1), and to move the cursor up one line on the
--       screen (cuu1).  This is necessary because it  is  not  always  safe  to
--       transmit  \n ^D and \r, as the system may change or discard them.  (The
--       library routines dealing with terminfo set tty modes so that  tabs  are
--       never  expanded, so \t is safe to send.  This turns out to be essential
-+       The  Microterm ACT-IV needs the current row and column sent preceded by
-+       a  ^T,  with  the  row   and   column   simply   encoded   in   binary,
-+       "cup=^T%p1%c%p2%c".   Terminals  which  use  "%c"  need  to  be able to
-+       backspace the cursor (cub1), and to move the cursor up one line on  the
-+       screen  (cuu1).   This  is  necessary  because it is not always safe to
-+       transmit \n ^D and \r, as the system may change or discard them.   (The
-+       library  routines  dealing with terminfo set tty modes so that tabs are
-+       never expanded, so \t is safe to send.  This turns out to be  essential
-        for the Ann Arbor 4080.)
- 
--       A final example is the LSI ADM-3a, which uses row and column offset  by
-+       A  final example is the LSI ADM-3a, which uses row and column offset by
-        a blank character, thus "cup=\E=%p1%' '%+%c%p2%' '%+%c".  After sending
--       "\E=", this pushes the first parameter, pushes the ASCII  value  for  a
-+       "\E=",  this  pushes  the first parameter, pushes the ASCII value for a
-        space (32), adds them (pushing the sum on the stack in place of the two
--       previous values) and outputs that value as a character.  Then the  same
--       is  done for the second parameter.  More complex arithmetic is possible
-+       previous  values) and outputs that value as a character.  Then the same
-+       is done for the second parameter.  More complex arithmetic is  possible
-        using the stack.
- 
- 
-

    Cursor Motions

    --       If the terminal has a fast way to home the cursor (to very  upper  left
--       corner  of screen) then this can be given as home; similarly a fast way
--       of getting to the lower left-hand corner can be given as ll;  this  may
-+       If  the  terminal has a fast way to home the cursor (to very upper left
-+       corner of screen) then this can be given as home; similarly a fast  way
-+       of  getting  to the lower left-hand corner can be given as ll; this may
-        involve going up with cuu1 from the home position, but a program should
-        never do this itself (unless ll does) because it can make no assumption
--       about  the  effect  of moving up from the home position.  Note that the
--       home position is the same as addressing to (0,0): to the top left  cor-
-+       about the effect of moving up from the home position.   Note  that  the
-+       home  position is the same as addressing to (0,0): to the top left cor-
-        ner of the screen, not of memory.  (Thus, the \EH sequence on HP termi-
-        nals cannot be used for home.)
- 
-        If the terminal has row or column absolute cursor addressing, these can
--       be  given  as  single  parameter  capabilities hpa (horizontal position
--       absolute) and vpa (vertical position absolute).   Sometimes  these  are
--       shorter  than  the  more  general  two  parameter sequence (as with the
--       hp2645) and can be used in preference to cup.  If there are  parameter-
--       ized  local  motions  (e.g.,  move  n spaces to the right) these can be
--       given as cud, cub, cuf, and cuu with a single parameter indicating  how
--       many  spaces  to move.  These are primarily useful if the terminal does
-+       be given as single  parameter  capabilities  hpa  (horizontal  position
-+       absolute)  and  vpa  (vertical position absolute).  Sometimes these are
-+       shorter than the more general  two  parameter  sequence  (as  with  the
-+       hp2645)  and can be used in preference to cup.  If there are parameter-
-+       ized local motions (e.g., move n spaces to  the  right)  these  can  be
-+       given  as cud, cub, cuf, and cuu with a single parameter indicating how
-+       many spaces to move.  These are primarily useful if the  terminal  does
-        not have cup, such as the TEKTRONIX 4025.
- 
--       If the terminal needs to be in a special mode when  running  a  program
-+       If  the  terminal  needs to be in a special mode when running a program
-        that uses these capabilities, the codes to enter and exit this mode can
--       be given as smcup and rmcup.  This arises, for example, from  terminals
--       like  the  Concept  with more than one page of memory.  If the terminal
-+       be  given as smcup and rmcup.  This arises, for example, from terminals
-+       like the Concept with more than one page of memory.   If  the  terminal
-        has only memory relative cursor addressing and not screen relative cur-
-        sor addressing, a one screen-sized window must be fixed into the termi-
--       nal for cursor addressing to work properly.  This is also used for  the
--       TEKTRONIX  4025,  where  smcup sets the command character to be the one
--       used by terminfo.  If the smcup sequence will not  restore  the  screen
--       after  an  rmcup  sequence  is output (to the state prior to outputting
-+       nal  for cursor addressing to work properly.  This is also used for the
-+       TEKTRONIX 4025, where smcup sets the command character to  be  the  one
-+       used  by  terminfo.   If the smcup sequence will not restore the screen
-+       after an rmcup sequence is output (to the  state  prior  to  outputting
-        rmcup), specify nrrmc.
- 
- 
-

    Area Clears

    --       If the terminal can clear from the current position to the end  of  the
--       line,  leaving  the cursor where it is, this should be given as el.  If
--       the terminal can clear from the beginning of the line  to  the  current
--       position  inclusive,  leaving  the  cursor  where it is, this should be
--       given as el1.  If the terminal can clear from the current  position  to
--       the  end  of  the display, then this should be given as ed.  Ed is only
-+       If  the  terminal can clear from the current position to the end of the
-+       line, leaving the cursor where it is, this should be given as  el.   If
-+       the  terminal  can  clear from the beginning of the line to the current
-+       position inclusive, leaving the cursor where  it  is,  this  should  be
-+       given  as  el1.  If the terminal can clear from the current position to
-+       the end of the display, then this should be given as ed.   Ed  is  only
-        defined from the first column of a line.  (Thus, it can be simulated by
-        a request to delete a large number of lines, if a true ed is not avail-
-        able.)
- 
- 
-

    Insert/delete line and vertical motions

    --       If the terminal can open a new blank line before  the  line  where  the
--       cursor  is,  this  should  be  given as il1; this is done only from the
--       first position of a line.  The cursor must then  appear  on  the  newly
--       blank  line.   If  the terminal can delete the line which the cursor is
--       on, then this should be given as dl1; this is done only from the  first
-+       If  the  terminal  can  open a new blank line before the line where the
-+       cursor is, this should be given as il1; this  is  done  only  from  the
-+       first  position  of  a  line.  The cursor must then appear on the newly
-+       blank line.  If the terminal can delete the line which  the  cursor  is
-+       on,  then this should be given as dl1; this is done only from the first
-        position on the line to be deleted.  Versions of il1 and dl1 which take
-        a single parameter and insert or delete that many lines can be given as
-        il and dl.
- 
--       If  the  terminal  has a settable scrolling region (like the vt100) the
--       command to set this can be described with  the  csr  capability,  which
-+       If the terminal has a settable scrolling region (like  the  vt100)  the
-+       command  to  set  this  can be described with the csr capability, which
-        takes two parameters: the top and bottom lines of the scrolling region.
-        The cursor position is, alas, undefined after using this command.
- 
--       It is possible to get the effect of insert or delete line using csr  on
--       a  properly chosen region; the sc and rc (save and restore cursor) com-
--       mands may be useful for ensuring that  your  synthesized  insert/delete
--       string  does  not  move the cursor.  (Note that the ncurses(3x) library
--       does  this  synthesis  automatically,   so   you   need   not   compose
-+       It  is possible to get the effect of insert or delete line using csr on
-+       a properly chosen region; the sc and rc (save and restore cursor)  com-
-+       mands  may  be  useful for ensuring that your synthesized insert/delete
-+       string does not move the cursor.  (Note that  the  ncurses(3x)  library
-+       does   this   synthesis   automatically,   so   you  need  not  compose
-        insert/delete strings for an entry with csr).
- 
-        Yet another way to construct insert and delete might be to use a combi-
--       nation of index with the memory-lock feature found  on  some  terminals
-+       nation  of  index  with the memory-lock feature found on some terminals
-        (like the HP-700/90 series, which however also has insert/delete).
- 
--       Inserting  lines  at  the  top or bottom of the screen can also be done
--       using ri or ind on many terminals without a  true  insert/delete  line,
-+       Inserting lines at the top or bottom of the screen  can  also  be  done
-+       using  ri  or  ind on many terminals without a true insert/delete line,
-        and is often faster even on terminals with those features.
- 
-        The boolean non_dest_scroll_region should be set if each scrolling win-
--       dow is effectively a view port on a screen-sized canvas.  To  test  for
-+       dow  is  effectively a view port on a screen-sized canvas.  To test for
-        this capability, create a scrolling region in the middle of the screen,
--       write something to the bottom line, move the cursor to the top  of  the
-+       write  something  to the bottom line, move the cursor to the top of the
-        region, and do ri followed by dl1 or ind.  If the data scrolled off the
--       bottom of the region by the  ri  re-appears,  then  scrolling  is  non-
--       destructive.   System  V  and XSI Curses expect that ind, ri, indn, and
--       rin will simulate destructive scrolling; their  documentation  cautions
--       you  not to define csr unless this is true.  This curses implementation
-+       bottom  of  the  region  by  the  ri re-appears, then scrolling is non-
-+       destructive.  System V and XSI Curses expect that ind,  ri,  indn,  and
-+       rin  will  simulate destructive scrolling; their documentation cautions
-+       you not to define csr unless this is true.  This curses  implementation
-        is more liberal and will do explicit erases after scrolling if ndsrc is
-        defined.
- 
--       If  the  terminal has the ability to define a window as part of memory,
--       which all commands affect, it should  be  given  as  the  parameterized
--       string  wind.  The four parameters are the starting and ending lines in
-+       If the terminal has the ability to define a window as part  of  memory,
-+       which  all  commands  affect,  it  should be given as the parameterized
-+       string wind.  The four parameters are the starting and ending lines  in
-        memory and the starting and ending columns in memory, in that order.
- 
-        If the terminal can retain display memory above, then the da capability
--       should  be  given;  if  display  memory  can be retained below, then db
--       should be given.  These indicate that deleting a line or scrolling  may
--       bring  non-blank lines up from below or that scrolling back with ri may
-+       should be given; if display memory  can  be  retained  below,  then  db
-+       should  be given.  These indicate that deleting a line or scrolling may
-+       bring non-blank lines up from below or that scrolling back with ri  may
-        bring down non-blank lines.
- 
- 
-

    Insert/Delete Character

    --       There are two basic kinds of  intelligent  terminals  with  respect  to
--       insert/delete  character  which  can  be described using terminfo.  The
--       most common insert/delete character operations affect only the  charac-
--       ters  on  the current line and shift characters off the end of the line
-+       There  are  two  basic  kinds  of intelligent terminals with respect to
-+       insert/delete character which can be  described  using  terminfo.   The
-+       most  common insert/delete character operations affect only the charac-
-+       ters on the current line and shift characters off the end of  the  line
-        rigidly.  Other terminals, such as the Concept 100 and the Perkin Elmer
-        Owl, make a distinction between typed and untyped blanks on the screen,
--       shifting upon an insert or delete only  to  an  untyped  blank  on  the
-+       shifting  upon  an  insert  or  delete  only to an untyped blank on the
-        screen which is either eliminated, or expanded to two untyped blanks.
- 
--       You  can determine the kind of terminal you have by clearing the screen
--       and then typing text separated by cursor  motions.   Type  "abc    def"
--       using  local  cursor  motions  (not  spaces)  between the "abc" and the
--       "def".  Then position the cursor before the "abc" and put the  terminal
--       in  insert  mode.   If typing characters causes the rest of the line to
--       shift rigidly and characters to fall off the end,  then  your  terminal
--       does  not  distinguish  between  blanks  and untyped positions.  If the
--       "abc" shifts over to the "def" which then move together around the  end
--       of  the current line and onto the next as you insert, you have the sec-
--       ond type of terminal, and should give the capability in,  which  stands
-+       You can determine the kind of terminal you have by clearing the  screen
-+       and  then  typing  text separated by cursor motions.  Type "abc    def"
-+       using local cursor motions (not  spaces)  between  the  "abc"  and  the
-+       "def".   Then position the cursor before the "abc" and put the terminal
-+       in insert mode.  If typing characters causes the rest of  the  line  to
-+       shift  rigidly  and  characters to fall off the end, then your terminal
-+       does not distinguish between blanks  and  untyped  positions.   If  the
-+       "abc"  shifts over to the "def" which then move together around the end
-+       of the current line and onto the next as you insert, you have the  sec-
-+       ond  type  of terminal, and should give the capability in, which stands
-        for "insert null".
- 
--       While  these  are  two  logically  separate attributes (one line versus
--       multi-line insert mode, and special treatment  of  untyped  spaces)  we
--       have  seen  no terminals whose insert mode cannot be described with the
-+       While these are two logically  separate  attributes  (one  line  versus
-+       multi-line  insert  mode,  and  special treatment of untyped spaces) we
-+       have seen no terminals whose insert mode cannot be described  with  the
-        single attribute.
- 
--       Terminfo can describe both terminals which have  an  insert  mode,  and
--       terminals  which send a simple sequence to open a blank position on the
-+       Terminfo  can  describe  both  terminals which have an insert mode, and
-+       terminals which send a simple sequence to open a blank position on  the
-        current line.  Give as smir the sequence to get into insert mode.  Give
--       as  rmir  the  sequence  to  leave  insert  mode.  Now give as ich1 any
--       sequence needed to be sent just before  sending  the  character  to  be
--       inserted.   Most  terminals with a true insert mode will not give ich1;
--       terminals which send a sequence to open a screen position  should  give
-+       as rmir the sequence to leave  insert  mode.   Now  give  as  ich1  any
-+       sequence  needed  to  be  sent  just before sending the character to be
-+       inserted.  Most terminals with a true insert mode will not  give  ich1;
-+       terminals  which  send a sequence to open a screen position should give
-        it here.
- 
--       If  your  terminal has both, insert mode is usually preferable to ich1.
--       Technically, you should not give  both  unless  the  terminal  actually
--       requires  both to be used in combination.  Accordingly, some non-curses
--       applications get confused if both are present; the symptom  is  doubled
--       characters  in  an  update using insert.  This requirement is now rare;
--       most ich sequences do not require previous smir, and most  smir  insert
--       modes  do  not  require ich1 before each character.  Therefore, the new
--       curses actually assumes this is the case and uses either  rmir/smir  or
--       ich/ich1  as appropriate (but not both).  If you have to write an entry
--       to be used under new curses for a terminal old  enough  to  need  both,
-+       If your terminal has both, insert mode is usually preferable  to  ich1.
-+       Technically,  you  should  not  give  both unless the terminal actually
-+       requires both to be used in combination.  Accordingly, some  non-curses
-+       applications  get  confused if both are present; the symptom is doubled
-+       characters in an update using insert.  This requirement  is  now  rare;
-+       most  ich  sequences do not require previous smir, and most smir insert
-+       modes do not require ich1 before each character.   Therefore,  the  new
-+       curses  actually  assumes this is the case and uses either rmir/smir or
-+       ich/ich1 as appropriate (but not both).  If you have to write an  entry
-+       to  be  used  under  new curses for a terminal old enough to need both,
-        include the rmir/smir sequences in ich1.
- 
-        If post insert padding is needed, give this as a number of milliseconds
--       in ip (a string option).  Any other sequence which may need to be  sent
-+       in  ip (a string option).  Any other sequence which may need to be sent
-        after an insert of a single character may also be given in ip.  If your
--       terminal needs both to be placed into an "insert mode"  and  a  special
--       code  to  precede each inserted character, then both smir/rmir and ich1
--       can be given, and both will be used.   The  ich  capability,  with  one
-+       terminal  needs  both  to be placed into an "insert mode" and a special
-+       code to precede each inserted character, then both smir/rmir  and  ich1
-+       can  be  given,  and  both  will be used.  The ich capability, with one
-        parameter, n, will repeat the effects of ich1 n times.
- 
--       If  padding  is  necessary between characters typed while not in insert
-+       If padding is necessary between characters typed while  not  in  insert
-        mode, give this as a number of milliseconds padding in rmp.
- 
--       It is occasionally necessary to move around while  in  insert  mode  to
--       delete  characters  on the same line (e.g., if there is a tab after the
--       insertion position).  If your terminal allows motion  while  in  insert
--       mode  you  can  give  the  capability mir to speed up inserting in this
--       case.  Omitting mir will affect only speed.   Some  terminals  (notably
--       Datamedia's)  must  not  have  mir because of the way their insert mode
-+       It  is  occasionally  necessary  to move around while in insert mode to
-+       delete characters on the same line (e.g., if there is a tab  after  the
-+       insertion  position).   If  your terminal allows motion while in insert
-+       mode you can give the capability mir to  speed  up  inserting  in  this
-+       case.   Omitting  mir  will affect only speed.  Some terminals (notably
-+       Datamedia's) must not have mir because of the  way  their  insert  mode
-        works.
- 
--       Finally, you can specify dch1 to delete a single  character,  dch  with
--       one  parameter,  n,  to  delete n characters, and delete mode by giving
--       smdc and rmdc to enter and exit delete  mode  (any  mode  the  terminal
-+       Finally,  you  can  specify dch1 to delete a single character, dch with
-+       one parameter, n, to delete n characters, and  delete  mode  by  giving
-+       smdc  and  rmdc  to  enter  and exit delete mode (any mode the terminal
-        needs to be placed in for dch1 to work).
- 
--       A  command  to  erase  n  characters (equivalent to outputting n blanks
-+       A command to erase n characters  (equivalent  to  outputting  n  blanks
-        without moving the cursor) can be given as ech with one parameter.
- 
- 
-

    Highlighting, Underlining, and Visible Bells

    -        If your terminal has one or more kinds of display attributes, these can
--       be  represented  in  a number of different ways.  You should choose one
--       display form as standout mode,  representing  a  good,  high  contrast,
--       easy-on-the-eyes,  format  for  highlighting  error  messages and other
--       attention getters.  (If you have a choice,  reverse  video  plus  half-
--       bright  is  good,  or reverse video alone.)  The sequences to enter and
--       exit standout mode are given as smso and rmso,  respectively.   If  the
--       code  to  change  into  or  out of standout mode leaves one or even two
--       blank spaces on the screen, as the TVI 912 and Teleray  1061  do,  then
-+       be represented in a number of different ways.  You  should  choose  one
-+       display  form  as  standout  mode,  representing a good, high contrast,
-+       easy-on-the-eyes, format for  highlighting  error  messages  and  other
-+       attention  getters.   (If  you  have a choice, reverse video plus half-
-+       bright is good, or reverse video alone.)  The sequences  to  enter  and
-+       exit  standout  mode  are given as smso and rmso, respectively.  If the
-+       code to change into or out of standout mode  leaves  one  or  even  two
-+       blank  spaces  on  the screen, as the TVI 912 and Teleray 1061 do, then
-        xmc should be given to tell how many spaces are left.
- 
-        Codes to begin underlining and end underlining can be given as smul and
-        rmul respectively.  If the terminal has a code to underline the current
--       character  and  move  the  cursor  one  space to the right, such as the
-+       character and move the cursor one space  to  the  right,  such  as  the
-        Microterm Mime, this can be given as uc.
- 
--       Other capabilities to enter various highlighting  modes  include  blink
--       (blinking)  bold  (bold or extra bright) dim (dim or half-bright) invis
--       (blanking or invisible text) prot (protected) rev (reverse video)  sgr0
--       (turn  off  all  attribute  modes) smacs (enter alternate character set
-+       Other  capabilities  to  enter various highlighting modes include blink
-+       (blinking) bold (bold or extra bright) dim (dim or  half-bright)  invis
-+       (blanking  or invisible text) prot (protected) rev (reverse video) sgr0
-+       (turn off all attribute modes) smacs  (enter  alternate  character  set
-        mode) and rmacs (exit alternate character set mode).  Turning on any of
-        these modes singly may or may not turn off other modes.
- 
--       If  there  is  a  sequence to set arbitrary combinations of modes, this
--       should be given as sgr (set attributes),  taking  9  parameters.   Each
--       parameter  is either 0 or nonzero, as the corresponding attribute is on
--       or off.  The 9 parameters are, in order: standout, underline,  reverse,
--       blink,  dim,  bold,  blank,  protect, alternate character set.  Not all
-+       If there is a sequence to set arbitrary  combinations  of  modes,  this
-+       should  be  given  as  sgr (set attributes), taking 9 parameters.  Each
-+       parameter is either 0 or nonzero, as the corresponding attribute is  on
-+       or  off.  The 9 parameters are, in order: standout, underline, reverse,
-+       blink, dim, bold, blank, protect, alternate  character  set.   Not  all
-        modes need be supported by sgr, only those for which corresponding sep-
-        arate attribute commands exist.
- 
-@@ -1746,17 +1753,17 @@
-                p8                   protect          not used
-                p9                   altcharset       ^O (off) ^N (on)
- 
--       We  begin each escape sequence by turning off any existing modes, since
--       there is no quick way to determine whether they are  active.   Standout
--       is  set up to be the combination of reverse and bold.  The vt220 termi-
--       nal has a protect mode, though it is not commonly used in  sgr  because
--       it  protects  characters  on  the screen from the host's erasures.  The
--       altcharset mode also is different in  that  it  is  either  ^O  or  ^N,
--       depending  on whether it is off or on.  If all modes are turned on, the
-+       We begin each escape sequence by turning off any existing modes,  since
-+       there  is  no quick way to determine whether they are active.  Standout
-+       is set up to be the combination of reverse and bold.  The vt220  termi-
-+       nal  has  a protect mode, though it is not commonly used in sgr because
-+       it protects characters on the screen from  the  host's  erasures.   The
-+       altcharset  mode  also  is  different  in  that  it is either ^O or ^N,
-+       depending on whether it is off or on.  If all modes are turned on,  the
-        resulting sequence is \E[0;1;4;5;7;8m^N.
- 
--       Some sequences are common to different modes.  For example, ;7 is  out-
--       put  when  either  p1  or  p3  is  true, that is, if either standout or
-+       Some  sequences are common to different modes.  For example, ;7 is out-
-+       put when either p1 or p3 is  true,  that  is,  if  either  standout  or
-        reverse modes are turned on.
- 
-        Writing out the above sequences, along with their dependencies yields
-@@ -1777,54 +1784,54 @@
-            sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p4%t;5%;
-                %?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 
--       Remember that if you specify sgr, you must also  specify  sgr0.   Also,
--       some  implementations  rely on sgr being given if sgr0 is, Not all ter-
--       minfo entries necessarily have an sgr string, however.   Many  terminfo
-+       Remember  that  if  you specify sgr, you must also specify sgr0.  Also,
-+       some implementations rely on sgr being given if sgr0 is, Not  all  ter-
-+       minfo  entries  necessarily have an sgr string, however.  Many terminfo
-        entries are derived from termcap entries which have no sgr string.  The
-        only drawback to adding an sgr string is that termcap also assumes that
-        sgr0 does not exit alternate character set mode.
- 
--       Terminals  with  the "magic cookie" glitch (xmc) deposit special "cook-
-+       Terminals with the "magic cookie" glitch (xmc) deposit  special  "cook-
-        ies" when they receive mode-setting sequences, which affect the display
--       algorithm  rather than having extra bits for each character.  Some ter-
--       minals, such as the HP 2621, automatically  leave  standout  mode  when
--       they  move  to  a  new line or the cursor is addressed.  Programs using
--       standout mode should exit standout mode before  moving  the  cursor  or
--       sending  a  newline,  unless  the msgr capability, asserting that it is
-+       algorithm rather than having extra bits for each character.  Some  ter-
-+       minals,  such  as  the  HP 2621, automatically leave standout mode when
-+       they move to a new line or the cursor  is  addressed.   Programs  using
-+       standout  mode  should  exit  standout mode before moving the cursor or
-+       sending a newline, unless the msgr capability,  asserting  that  it  is
-        safe to move in standout mode, is present.
- 
--       If the terminal has a way of flashing the screen to indicate  an  error
--       quietly  (a  bell replacement) then this can be given as flash; it must
-+       If  the  terminal has a way of flashing the screen to indicate an error
-+       quietly (a bell replacement) then this can be given as flash;  it  must
-        not move the cursor.
- 
--       If the cursor needs to be made more visible than normal when it is  not
-+       If  the cursor needs to be made more visible than normal when it is not
-        on the bottom line (to make, for example, a non-blinking underline into
--       an easier to find block or blinking underline) give  this  sequence  as
-+       an  easier  to  find block or blinking underline) give this sequence as
-        cvvis.  If there is a way to make the cursor completely invisible, give
--       that as civis.  The capability cnorm should be given which  undoes  the
-+       that  as  civis.  The capability cnorm should be given which undoes the
-        effects of both of these modes.
- 
--       If  your  terminal  correctly  generates underlined characters (with no
--       special codes needed) even though it  does  not  overstrike,  then  you
--       should  give  the  capability  ul.  If a character overstriking another
--       leaves both characters on the screen, specify the  capability  os.   If
-+       If your terminal correctly generates  underlined  characters  (with  no
-+       special  codes  needed)  even  though  it does not overstrike, then you
-+       should give the capability ul.  If  a  character  overstriking  another
-+       leaves  both  characters  on the screen, specify the capability os.  If
-        overstrikes are erasable with a blank, then this should be indicated by
-        giving eo.
- 
- 
-

    Keypad and Function Keys

    --       If the terminal has a keypad that transmits codes  when  the  keys  are
--       pressed,  this  information can be given.  Note that it is not possible
-+       If  the  terminal  has  a keypad that transmits codes when the keys are
-+       pressed, this information can be given.  Note that it is  not  possible
-        to handle terminals where the keypad only works in local (this applies,
--       for  example, to the unshifted HP 2621 keys).  If the keypad can be set
-+       for example, to the unshifted HP 2621 keys).  If the keypad can be  set
-        to transmit or not transmit, give these codes as smkx and rmkx.  Other-
-        wise the keypad is assumed to always transmit.
- 
--       The  codes  sent  by the left arrow, right arrow, up arrow, down arrow,
--       and home keys can be given as kcub1, kcuf1,  kcuu1,  kcud1,  and  khome
-+       The codes sent by the left arrow, right arrow, up  arrow,  down  arrow,
-+       and  home  keys  can  be given as kcub1, kcuf1, kcuu1, kcud1, and khome
-        respectively.  If there are function keys such as f0, f1, ..., f10, the
--       codes they send can be given as kf0, kf1, ...,  kf10.   If  these  keys
--       have  labels  other  than the default f0 through f10, the labels can be
-+       codes  they  send  can  be given as kf0, kf1, ..., kf10.  If these keys
-+       have labels other than the default f0 through f10, the  labels  can  be
-        given as lf0, lf1, ..., lf10.
- 
-        The codes transmitted by certain other special keys can be given:
-@@ -1863,64 +1870,64 @@
- 
-        o   khts (set a tab stop in this column).
- 
--       In addition, if the keypad has a 3 by 3 array  of  keys  including  the
--       four  arrow  keys,  the  other five keys can be given as ka1, ka3, kb2,
--       kc1, and kc3.  These keys are useful when the  effects  of  a  3  by  3
-+       In  addition,  if  the  keypad has a 3 by 3 array of keys including the
-+       four arrow keys, the other five keys can be given  as  ka1,  ka3,  kb2,
-+       kc1,  and  kc3.   These  keys  are  useful when the effects of a 3 by 3
-        directional pad are needed.
- 
-        Strings to program function keys can be given as pfkey, pfloc, and pfx.
--       A string to program screen labels should be specified as pln.  Each  of
--       these  strings takes two parameters: the function key number to program
-+       A  string to program screen labels should be specified as pln.  Each of
-+       these strings takes two parameters: the function key number to  program
-        (from 0 to 10) and the string to program it with.  Function key numbers
--       out  of  this  range may program undefined keys in a terminal dependent
--       manner.  The difference between the capabilities is that  pfkey  causes
--       pressing  the  given  key  to  be the same as the user typing the given
--       string; pfloc causes the string to  be  executed  by  the  terminal  in
-+       out of this range may program undefined keys in  a  terminal  dependent
-+       manner.   The  difference between the capabilities is that pfkey causes
-+       pressing the given key to be the same as  the  user  typing  the  given
-+       string;  pfloc  causes  the  string  to  be executed by the terminal in
-        local; and pfx causes the string to be transmitted to the computer.
- 
--       The  capabilities  nlab,  lw  and  lh define the number of programmable
--       screen labels and their width and height.  If  there  are  commands  to
--       turn  the  labels on and off, give them in smln and rmln.  smln is nor-
--       mally output after one or more pln sequences  to  make  sure  that  the
-+       The capabilities nlab, lw and lh  define  the  number  of  programmable
-+       screen  labels  and  their  width and height.  If there are commands to
-+       turn the labels on and off, give them in smln and rmln.  smln  is  nor-
-+       mally  output  after  one  or  more pln sequences to make sure that the
-        change becomes visible.
- 
- 
-

    Tabs and Initialization

    -        A few capabilities are used only for tabs:
- 
--       o   If  the  terminal  has hardware tabs, the command to advance to the
-+       o   If the terminal has hardware tabs, the command to  advance  to  the
-            next tab stop can be given as ht (usually control/I).
- 
-        o   A "back-tab" command which moves leftward to the preceding tab stop
-            can be given as cbt.
- 
--           By  convention,  if the teletype modes indicate that tabs are being
--           expanded by the computer rather than being sent  to  the  terminal,
--           programs  should  not use ht or cbt even if they are present, since
-+           By convention, if the teletype modes indicate that tabs  are  being
-+           expanded  by  the  computer rather than being sent to the terminal,
-+           programs should not use ht or cbt even if they are  present,  since
-            the user may not have the tab stops properly set.
- 
--       o   If the terminal has hardware tabs which are initially set  every  n
-+       o   If  the  terminal has hardware tabs which are initially set every n
-            spaces when the terminal is powered up, the numeric parameter it is
-            given, showing the number of spaces the tabs are set to.
- 
-            The it capability is normally used by the tset command to determine
--           whether  to set the mode for hardware tab expansion, and whether to
-+           whether to set the mode for hardware tab expansion, and whether  to
-            set the tab stops.  If the terminal has tab stops that can be saved
--           in  non-volatile  memory,  the terminfo description can assume that
-+           in non-volatile memory, the terminfo description  can  assume  that
-            they are properly set.
- 
-        Other capabilities include
- 
-        o   is1, is2, and is3, initialization strings for the terminal,
- 
--       o   iprog, the path name of a program to be run to initialize the  ter-
-+       o   iprog,  the path name of a program to be run to initialize the ter-
-            minal,
- 
-        o   and if, the name of a file containing long initialization strings.
- 
--       These  strings  are  expected to set the terminal into modes consistent
--       with the rest of the terminfo description.  They are normally  sent  to
--       the  terminal,  by  the  init option of the tput program, each time the
-+       These strings are expected to set the terminal  into  modes  consistent
-+       with  the  rest of the terminfo description.  They are normally sent to
-+       the terminal, by the init option of the tput  program,  each  time  the
-        user logs in.  They will be printed in the following order:
- 
-               run the program
-@@ -1944,34 +1951,34 @@
-               and finally output
-                      is3.
- 
--       Most initialization is done with is2.  Special terminal  modes  can  be
--       set  up  without duplicating strings by putting the common sequences in
-+       Most  initialization  is  done with is2.  Special terminal modes can be
-+       set up without duplicating strings by putting the common  sequences  in
-        is2 and special cases in is1 and is3.
- 
--       A set of sequences that does a harder  reset  from  a  totally  unknown
-+       A  set  of  sequences  that  does a harder reset from a totally unknown
-        state can be given as rs1, rs2, rf and rs3, analogous to is1 , is2 , if
--       and is3 respectively.  These strings are  output  by  reset  option  of
--       tput,  or  by  the reset program (an alias of tset), which is used when
-+       and  is3  respectively.   These  strings  are output by reset option of
-+       tput, or by the reset program (an alias of tset), which  is  used  when
-        the terminal gets into a wedged state.  Commands are normally placed in
-        rs1, rs2 rs3 and rf only if they produce annoying effects on the screen
-        and are not necessary when logging in.  For example, the command to set
--       the  vt100  into  80-column  mode would normally be part of is2, but it
--       causes an annoying glitch of the screen  and  is  not  normally  needed
-+       the vt100 into 80-column mode would normally be part  of  is2,  but  it
-+       causes  an  annoying  glitch  of  the screen and is not normally needed
-        since the terminal is usually already in 80-column mode.
- 
--       The  reset  program  writes  strings including iprog, etc., in the same
--       order as the init program, using rs1, etc., instead of  is1,  etc.   If
--       any  of  rs1, rs2, rs3, or rf reset capability strings are missing, the
-+       The reset program writes strings including iprog,  etc.,  in  the  same
-+       order  as  the  init program, using rs1, etc., instead of is1, etc.  If
-+       any of rs1, rs2, rs3, or rf reset capability strings are  missing,  the
-        reset program falls back upon the corresponding initialization capabil-
-        ity string.
- 
--       If  there are commands to set and clear tab stops, they can be given as
-+       If there are commands to set and clear tab stops, they can be given  as
-        tbc (clear all tab stops) and hts (set a tab stop in the current column
--       of  every  row).   If a more complex sequence is needed to set the tabs
-+       of every row).  If a more complex sequence is needed to  set  the  tabs
-        than can be described by this, the sequence can be placed in is2 or if.
- 
--       The tput reset command uses the same capability strings  as  the  reset
--       command,  although  the two programs (tput and reset) provide different
-+       The  tput  reset  command uses the same capability strings as the reset
-+       command, although the two programs (tput and reset)  provide  different
-        command-line options.
- 
-        In practice, these terminfo capabilities are not often used in initial-
-@@ -1980,78 +1987,78 @@
-        o   Almost all hardware terminals (at least those which supported tabs)
-            initialized those to every eight columns:
- 
--           The only exception was the AT&T 2300  series,  which  set  tabs  to
-+           The  only  exception  was  the  AT&T 2300 series, which set tabs to
-            every five columns.
- 
--       o   In  particular, developers of the hardware terminals which are com-
--           monly used as models for modern terminal emulators  provided  docu-
-+       o   In particular, developers of the hardware terminals which are  com-
-+           monly  used  as models for modern terminal emulators provided docu-
-            mentation demonstrating that eight columns were the standard.
- 
-        o   Because of this, the terminal initialization programs tput and tset
--           use  the  tbc  (clear_all_tabs)  and  hts  (set_tab)   capabilities
--           directly  only when the it (init_tabs) capability is set to a value
-+           use   the  tbc  (clear_all_tabs)  and  hts  (set_tab)  capabilities
-+           directly only when the it (init_tabs) capability is set to a  value
-            other than eight.
- 
- 
-

    Delays and Padding

    --       Many older and slower terminals do not support either XON/XOFF  or  DTR
--       handshaking,  including  hard copy terminals and some very archaic CRTs
--       (including, for example, DEC VT100s).  These may require padding  char-
-+       Many  older  and slower terminals do not support either XON/XOFF or DTR
-+       handshaking, including hard copy terminals and some very  archaic  CRTs
-+       (including,  for example, DEC VT100s).  These may require padding char-
-        acters after certain cursor motions and screen changes.
- 
-        If the terminal uses xon/xoff handshaking for flow control (that is, it
--       automatically emits ^S back to the host  when  its  input  buffers  are
--       close  to  full),  set xon.  This capability suppresses the emission of
--       padding.  You can also set it for memory-mapped console devices  effec-
--       tively  that  do  not  have  a speed limit.  Padding information should
-+       automatically  emits  ^S  back  to  the host when its input buffers are
-+       close to full), set xon.  This capability suppresses  the  emission  of
-+       padding.   You can also set it for memory-mapped console devices effec-
-+       tively that do not have a  speed  limit.   Padding  information  should
-        still be included so that routines can make better decisions about rel-
-        ative costs, but actual pad characters will not be transmitted.
- 
-        If pb (padding baud rate) is given, padding is suppressed at baud rates
--       below the value of pb.  If the entry has no  padding  baud  rate,  then
-+       below  the  value  of  pb.  If the entry has no padding baud rate, then
-        whether padding is emitted or not is completely controlled by xon.
- 
--       If  the  terminal requires other than a null (zero) character as a pad,
--       then this can be given as pad.  Only the first  character  of  the  pad
-+       If the terminal requires other than a null (zero) character as  a  pad,
-+       then  this  can  be  given as pad.  Only the first character of the pad
-        string is used.
- 
- 
-

    Status Lines

    --       Some  terminals  have an extra "status line" which is not normally used
-+       Some terminals have an extra "status line" which is not  normally  used
-        by software (and thus not counted in the terminal's lines capability).
- 
--       The simplest case is a status line which is cursor-addressable but  not
-+       The  simplest case is a status line which is cursor-addressable but not
-        part of the main scrolling region on the screen; the Heathkit H19 has a
--       status line of this kind, as would  a  24-line  VT100  with  a  23-line
-+       status  line  of  this  kind,  as  would a 24-line VT100 with a 23-line
-        scrolling region set up on initialization.  This situation is indicated
-        by the hs capability.
- 
--       Some terminals with status lines need special sequences to  access  the
--       status  line.  These may be expressed as a string with single parameter
--       tsl which takes the cursor to a given zero-origin column on the  status
--       line.   The  capability fsl must return to the main-screen cursor posi-
--       tions before the last tsl.  You may need to embed the string values  of
--       sc  (save  cursor) and rc (restore cursor) in tsl and fsl to accomplish
-+       Some  terminals  with status lines need special sequences to access the
-+       status line.  These may be expressed as a string with single  parameter
-+       tsl  which takes the cursor to a given zero-origin column on the status
-+       line.  The capability fsl must return to the main-screen  cursor  posi-
-+       tions  before the last tsl.  You may need to embed the string values of
-+       sc (save cursor) and rc (restore cursor) in tsl and fsl  to  accomplish
-        this.
- 
--       The status line is normally assumed to be the same width as  the  width
--       of  the  terminal.   If  this  is  untrue,  you can specify it with the
-+       The  status  line is normally assumed to be the same width as the width
-+       of the terminal.  If this is  untrue,  you  can  specify  it  with  the
-        numeric capability wsl.
- 
-        A command to erase or blank the status line may be specified as dsl.
- 
--       The boolean capability eslok specifies  that  escape  sequences,  tabs,
-+       The  boolean  capability  eslok  specifies that escape sequences, tabs,
-        etc., work ordinarily in the status line.
- 
--       The  ncurses implementation does not yet use any of these capabilities.
-+       The ncurses implementation does not yet use any of these  capabilities.
-        They are documented here in case they ever become important.
- 
- 
-

    Line Graphics

    --       Many terminals have alternate character sets useful for  forms-drawing.
-+       Many  terminals have alternate character sets useful for forms-drawing.
-        Terminfo and curses have built-in support for most of the drawing char-
--       acters supported by the VT100,  with  some  characters  from  the  AT&T
--       4410v1  added.   This  alternate  character set may be specified by the
-+       acters  supported  by  the  VT100,  with  some characters from the AT&T
-+       4410v1 added.  This alternate character set may  be  specified  by  the
-        acsc capability.
- 
-          Glyph                       ACS            Ascii     acsc     acsc
-@@ -2092,34 +2099,34 @@
- 
-        A few notes apply to the table itself:
- 
--       o   X/Open Curses incorrectly states that the mapping  for  lantern  is
--           uppercase  "I"  although Unix implementations use the lowercase "i"
-+       o   X/Open  Curses  incorrectly  states that the mapping for lantern is
-+           uppercase "I" although Unix implementations use the  lowercase  "i"
-            mapping.
- 
--       o   The DEC VT100 implemented graphics using  the  alternate  character
--           set  feature, temporarily switching modes and sending characters in
-+       o   The  DEC  VT100  implemented graphics using the alternate character
-+           set feature, temporarily switching modes and sending characters  in
-            the range 0x60 (96) to 0x7e (126) (the acsc Value column in the ta-
-            ble).
- 
-        o   The AT&T terminal added graphics characters outside that range.
- 
--           Some  of  the  characters  within the range do not match the VT100;
--           presumably they were used in the AT&T terminal:  board  of  squares
--           replaces  the  VT100  newline symbol, while lantern symbol replaces
-+           Some of the characters within the range do  not  match  the  VT100;
-+           presumably  they  were  used in the AT&T terminal: board of squares
-+           replaces the VT100 newline symbol, while  lantern  symbol  replaces
-            the VT100 vertical tab symbol.  The other VT100 symbols for control
--           characters  (horizontal tab, carriage return and line-feed) are not
-+           characters (horizontal tab, carriage return and line-feed) are  not
-            (re)used in curses.
- 
--       The best way to define a new device's graphics set is to add  a  column
--       to  a  copy of this table for your terminal, giving the character which
--       (when emitted between smacs/rmacs switches) will  be  rendered  as  the
-+       The  best  way to define a new device's graphics set is to add a column
-+       to a copy of this table for your terminal, giving the  character  which
-+       (when  emitted  between  smacs/rmacs  switches) will be rendered as the
-        corresponding graphic.  Then read off the VT100/your terminal character
-        pairs right to left in sequence; these become the ACSC string.
- 
- 
-

    Color Handling

    --       The curses library functions init_pair and  init_color  manipulate  the
--       color   pairs   and   color  values  discussed  in  this  section  (see
-+       The  curses  library  functions init_pair and init_color manipulate the
-+       color  pairs  and  color  values  discussed  in   this   section   (see
-        curs_color(3x) for details on these and related functions).
- 
-        Most color terminals are either "Tektronix-like" or "HP-like":
-@@ -2128,43 +2135,43 @@
-            is usually 8), and can set character-cell foreground and background
-            characters independently, mixing them into N * N color-pairs.
- 
--       o   On HP-like terminals, the user must set each color  pair  up  sepa-
--           rately  (foreground and background are not independently settable).
-+       o   On  HP-like  terminals,  the user must set each color pair up sepa-
-+           rately (foreground and background are not independently  settable).
-            Up to M color-pairs may be set up from 2*M different colors.  ANSI-
-            compatible terminals are Tektronix-like.
- 
-        Some basic color capabilities are independent of the color method.  The
--       numeric capabilities colors and pairs specify the  maximum  numbers  of
--       colors  and  color-pairs  that can be displayed simultaneously.  The op
-+       numeric  capabilities  colors  and pairs specify the maximum numbers of
-+       colors and color-pairs that can be displayed  simultaneously.   The  op
-        (original pair) string resets foreground and background colors to their
--       default  values  for  the terminal.  The oc string resets all colors or
--       color-pairs to their default values for the terminal.   Some  terminals
-+       default values for the terminal.  The oc string resets  all  colors  or
-+       color-pairs  to  their default values for the terminal.  Some terminals
-        (including many PC terminal emulators) erase screen areas with the cur-
--       rent background color rather  than  the  power-up  default  background;
-+       rent  background  color  rather  than  the power-up default background;
-        these should have the boolean capability bce.
- 
-        While the curses library works with color pairs (reflecting the inabil-
--       ity of some devices to set foreground and  background  colors  indepen-
-+       ity  of  some  devices to set foreground and background colors indepen-
-        dently), there are separate capabilities for setting these features:
- 
--       o   To  change  the  current  foreground  or background color on a Tek-
--           tronix-type terminal, use setaf (set  ANSI  foreground)  and  setab
--           (set  ANSI background) or setf (set foreground) and setb (set back-
--           ground).  These take one parameter, the  color  number.   The  SVr4
--           documentation  describes only setaf/setab; the XPG4 draft says that
--           "If the terminal supports ANSI escape sequences to  set  background
--           and  foreground,  they  should be coded as setaf and setab, respec-
-+       o   To change the current foreground or  background  color  on  a  Tek-
-+           tronix-type  terminal,  use  setaf  (set ANSI foreground) and setab
-+           (set ANSI background) or setf (set foreground) and setb (set  back-
-+           ground).   These  take  one  parameter, the color number.  The SVr4
-+           documentation describes only setaf/setab; the XPG4 draft says  that
-+           "If  the  terminal supports ANSI escape sequences to set background
-+           and foreground, they should be coded as setaf  and  setab,  respec-
-            tively.
- 
--       o   If the terminal supports other escape sequences to  set  background
--           and  foreground,  they  should  be  coded as setf and setb, respec-
--           tively.  The vidputs and the refresh(3x) functions  use  the  setaf
-+       o   If  the  terminal supports other escape sequences to set background
-+           and foreground, they should be coded  as  setf  and  setb,  respec-
-+           tively.   The  vidputs  and the refresh(3x) functions use the setaf
-            and setab capabilities if they are defined.
- 
--       The  setaf/setab and setf/setb capabilities take a single numeric argu-
--       ment each.  Argument values 0-7 of setaf/setab are portably defined  as
--       follows  (the  middle  column  is the symbolic #define available in the
--       header for the curses or ncurses libraries).  The terminal hardware  is
-+       The setaf/setab and setf/setb capabilities take a single numeric  argu-
-+       ment  each.  Argument values 0-7 of setaf/setab are portably defined as
-+       follows (the middle column is the symbolic  #define  available  in  the
-+       header  for the curses or ncurses libraries).  The terminal hardware is
-        free to map these as it likes, but the RGB values indicate normal loca-
-        tions in color space.
- 
-@@ -2194,28 +2201,28 @@
-        It is important to not confuse the two sets of color capabilities; oth-
-        erwise red/blue will be interchanged on the display.
- 
--       On an HP-like terminal, use scp with a color-pair number  parameter  to
-+       On  an  HP-like terminal, use scp with a color-pair number parameter to
-        set which color pair is current.
- 
-        Some terminals allow the color values to be modified:
- 
--       o   On  a Tektronix-like terminal, the capability ccc may be present to
--           indicate that colors can be modified.  If so, the initc  capability
-+       o   On a Tektronix-like terminal, the capability ccc may be present  to
-+           indicate  that colors can be modified.  If so, the initc capability
-            will take a color number (0 to colors - 1)and three more parameters
--           which describe the color.  These three parameters default to  being
-+           which  describe the color.  These three parameters default to being
-            interpreted as RGB (Red, Green, Blue) values.  If the boolean capa-
--           bility hls is present, they are instead  as  HLS  (Hue,  Lightness,
-+           bility  hls  is  present,  they are instead as HLS (Hue, Lightness,
-            Saturation) indices.  The ranges are terminal-dependent.
- 
--       o   On  an HP-like terminal, initp may give a capability for changing a
-+       o   On an HP-like terminal, initp may give a capability for changing  a
-            color-pair value.  It will take seven parameters; a color-pair num-
--           ber  (0  to  max_pairs - 1), and two triples describing first back-
--           ground and then foreground colors.  These parameters must be  (Red,
-+           ber (0 to max_pairs - 1), and two triples  describing  first  back-
-+           ground  and then foreground colors.  These parameters must be (Red,
-            Green, Blue) or (Hue, Lightness, Saturation) depending on hls.
- 
--       On  some color terminals, colors collide with highlights.  You can reg-
--       ister these collisions with the ncv capability.  This is a bit-mask  of
--       attributes  not to be used when colors are enabled.  The correspondence
-+       On some color terminals, colors collide with highlights.  You can  reg-
-+       ister  these collisions with the ncv capability.  This is a bit-mask of
-+       attributes not to be used when colors are enabled.  The  correspondence
-        with the attributes understood by curses is as follows:
- 
-                   Attribute              Bit   Decimal      Set by
-@@ -2227,6 +2234,7 @@
-                   A_BOLD                 5     32           sgr
-                   A_INVIS                6     64           sgr
-                   A_PROTECT              7     128          sgr
-+
-                   A_ALTCHARSET           8     256          sgr
-                   A_HORIZONTAL           9     512          sgr1
-                   A_LEFT                 10    1024         sgr1
-@@ -2236,134 +2244,134 @@
-                   A_VERTICAL             14    16384        sgr1
-                   A_ITALIC               15    32768        sitm
- 
--       For example, on many IBM PC consoles, the underline attribute  collides
--       with  the  foreground  color  blue  and is not available in color mode.
-+       For  example, on many IBM PC consoles, the underline attribute collides
-+       with the foreground color blue and is  not  available  in  color  mode.
-        These should have an ncv capability of 2.
- 
--       SVr4 curses does nothing with ncv, ncurses recognizes it and  optimizes
-+       SVr4  curses does nothing with ncv, ncurses recognizes it and optimizes
-        the output in favor of colors.
- 
- 
-

    Miscellaneous

    --       If  the  terminal requires other than a null (zero) character as a pad,
--       then this can be given as pad.  Only the first  character  of  the  pad
-+       If the terminal requires other than a null (zero) character as  a  pad,
-+       then  this  can  be  given as pad.  Only the first character of the pad
-        string is used.  If the terminal does not have a pad character, specify
--       npc.  Note that ncurses implements the termcap-compatible PC  variable;
--       though  the  application  may  set this value to something other than a
--       null, ncurses will test npc first and use napms if the terminal has  no
-+       npc.   Note that ncurses implements the termcap-compatible PC variable;
-+       though the application may set this value to  something  other  than  a
-+       null,  ncurses will test npc first and use napms if the terminal has no
-        pad character.
- 
--       If  the terminal can move up or down half a line, this can be indicated
-+       If the terminal can move up or down half a line, this can be  indicated
-        with hu (half-line up) and hd (half-line down).  This is primarily use-
-        ful for superscripts and subscripts on hard-copy terminals.  If a hard-
--       copy terminal can eject to the next page (form feed), give this  as  ff
-+       copy  terminal  can eject to the next page (form feed), give this as ff
-        (usually control/L).
- 
--       If  there  is  a  command to repeat a given character a given number of
--       times (to save time transmitting a large number  of  identical  charac-
--       ters)  this  can  be  indicated with the parameterized string rep.  The
--       first parameter is the character to be repeated and the second  is  the
-+       If there is a command to repeat a given character  a  given  number  of
-+       times  (to  save  time transmitting a large number of identical charac-
-+       ters) this can be indicated with the  parameterized  string  rep.   The
-+       first  parameter  is the character to be repeated and the second is the
-        number of times to repeat it.  Thus, tparm(repeat_char, 'x', 10) is the
-        same as "xxxxxxxxxx".
- 
-        If the terminal has a settable command character, such as the TEKTRONIX
--       4025,  this can be indicated with cmdch.  A prototype command character
--       is chosen which is used in all capabilities.  This character  is  given
--       in  the  cmdch  capability to identify it.  The following convention is
-+       4025, this can be indicated with cmdch.  A prototype command  character
-+       is  chosen  which is used in all capabilities.  This character is given
-+       in the cmdch capability to identify it.  The  following  convention  is
-        supported on some UNIX systems: The environment is to be searched for a
--       CC  variable,  and if found, all occurrences of the prototype character
-+       CC variable, and if found, all occurrences of the  prototype  character
-        are replaced with the character in the environment variable.
- 
--       Terminal descriptions that do not represent a specific  kind  of  known
--       terminal,  such  as  switch, dialup, patch, and network, should include
--       the gn (generic) capability so that programs can complain that they  do
--       not  know how to talk to the terminal.  (This capability does not apply
--       to virtual terminal descriptions for which  the  escape  sequences  are
-+       Terminal  descriptions  that  do not represent a specific kind of known
-+       terminal, such as switch, dialup, patch, and  network,  should  include
-+       the  gn (generic) capability so that programs can complain that they do
-+       not know how to talk to the terminal.  (This capability does not  apply
-+       to  virtual  terminal  descriptions  for which the escape sequences are
-        known.)
- 
-        If the terminal has a "meta key" which acts as a shift key, setting the
--       8th bit of any character transmitted, this fact can be  indicated  with
--       km.   Otherwise, software will assume that the 8th bit is parity and it
--       will usually be cleared.  If strings exist to turn this "meta mode"  on
-+       8th  bit  of any character transmitted, this fact can be indicated with
-+       km.  Otherwise, software will assume that the 8th bit is parity and  it
-+       will  usually be cleared.  If strings exist to turn this "meta mode" on
-        and off, they can be given as smm and rmm.
- 
-        If the terminal has more lines of memory than will fit on the screen at
--       once, the number of lines of memory can be indicated with lm.  A  value
-+       once,  the number of lines of memory can be indicated with lm.  A value
-        of lm#0 indicates that the number of lines is not fixed, but that there
-        is still more memory than fits on the screen.
- 
--       If the terminal is one of those supported by the UNIX virtual  terminal
-+       If  the terminal is one of those supported by the UNIX virtual terminal
-        protocol, the terminal number can be given as vt.
- 
--       Media  copy strings which control an auxiliary printer connected to the
--       terminal can be given as mc0: print the contents of  the  screen,  mc4:
--       turn  off  the printer, and mc5: turn on the printer.  When the printer
--       is on, all text sent to the terminal will be sent to the  printer.   It
--       is  undefined whether the text is also displayed on the terminal screen
--       when the printer is on.  A variation  mc5p  takes  one  parameter,  and
-+       Media copy strings which control an auxiliary printer connected to  the
-+       terminal  can  be  given as mc0: print the contents of the screen, mc4:
-+       turn off the printer, and mc5: turn on the printer.  When  the  printer
-+       is  on,  all text sent to the terminal will be sent to the printer.  It
-+       is undefined whether the text is also displayed on the terminal  screen
-+       when  the  printer  is  on.   A variation mc5p takes one parameter, and
-        leaves the printer on for as many characters as the value of the param-
-        eter, then turns the printer off.  The parameter should not exceed 255.
--       All  text,  including mc4, is transparently passed to the printer while
-+       All text, including mc4, is transparently passed to the  printer  while
-        an mc5p is in effect.
- 
- 
-

    Glitches and Braindamage

    --       Hazeltine terminals, which do not allow "~" characters to be  displayed
-+       Hazeltine  terminals, which do not allow "~" characters to be displayed
-        should indicate hz.
- 
--       Terminals  which  ignore a line-feed immediately after an am wrap, such
-+       Terminals which ignore a line-feed immediately after an am  wrap,  such
-        as the Concept and vt100, should indicate xenl.
- 
--       If el is required to get rid of standout  (instead  of  merely  writing
-+       If  el  is  required  to get rid of standout (instead of merely writing
-        normal text on top of it), xhp should be given.
- 
-        Teleray terminals, where tabs turn all characters moved over to blanks,
--       should indicate xt (destructive tabs).  Note: the  variable  indicating
--       this  is  now  "dest_tabs_magic_smso";  in  older versions, it was tel-
-+       should  indicate  xt (destructive tabs).  Note: the variable indicating
-+       this is now "dest_tabs_magic_smso"; in  older  versions,  it  was  tel-
-        eray_glitch.  This glitch is also taken to mean that it is not possible
-        to position the cursor on top of a "magic cookie", that to erase stand-
--       out mode it is instead necessary to use delete and  insert  line.   The
-+       out  mode  it  is instead necessary to use delete and insert line.  The
-        ncurses implementation ignores this glitch.
- 
--       The  Beehive Superbee, which is unable to correctly transmit the escape
--       or control/C characters, has xsb, indicating that the f1  key  is  used
--       for  escape  and  f2  for control/C.  (Only certain Superbees have this
--       problem, depending on the ROM.)  Note that in older terminfo  versions,
-+       The Beehive Superbee, which is unable to correctly transmit the  escape
-+       or  control/C  characters,  has xsb, indicating that the f1 key is used
-+       for escape and f2 for control/C.  (Only  certain  Superbees  have  this
-+       problem,  depending on the ROM.)  Note that in older terminfo versions,
-        this capability was called "beehive_glitch"; it is now "no_esc_ctl_c".
- 
--       Other  specific terminal problems may be corrected by adding more capa-
-+       Other specific terminal problems may be corrected by adding more  capa-
-        bilities of the form xx.
- 
- 
-

    Pitfalls of Long Entries

    --       Long terminfo entries are unlikely to be a problem; to date,  no  entry
--       has  even approached terminfo's 4096-byte string-table maximum.  Unfor-
--       tunately, the termcap translations are much more strictly  limited  (to
--       1023  bytes),  thus  termcap  translations of long terminfo entries can
-+       Long  terminfo  entries are unlikely to be a problem; to date, no entry
-+       has even approached terminfo's 4096-byte string-table maximum.   Unfor-
-+       tunately,  the  termcap translations are much more strictly limited (to
-+       1023 bytes), thus termcap translations of  long  terminfo  entries  can
-        cause problems.
- 
--       The man pages for 4.3BSD and older versions  of  tgetent  instruct  the
--       user  to  allocate a 1024-byte buffer for the termcap entry.  The entry
--       gets null-terminated by the termcap library, so that makes the  maximum
--       safe  length  for a termcap entry 1k-1 (1023) bytes.  Depending on what
--       the application and the termcap library being used does, and  where  in
--       the  termcap  file  the terminal type that tgetent is searching for is,
-+       The  man  pages  for  4.3BSD and older versions of tgetent instruct the
-+       user to allocate a 1024-byte buffer for the termcap entry.   The  entry
-+       gets  null-terminated by the termcap library, so that makes the maximum
-+       safe length for a termcap entry 1k-1 (1023) bytes.  Depending  on  what
-+       the  application  and the termcap library being used does, and where in
-+       the termcap file the terminal type that tgetent is  searching  for  is,
-        several bad things can happen.
- 
--       Some termcap libraries print a warning message or exit if they find  an
-+       Some  termcap libraries print a warning message or exit if they find an
-        entry that's longer than 1023 bytes; others do not; others truncate the
--       entries to 1023 bytes.  Some application programs  allocate  more  than
-+       entries  to  1023  bytes.  Some application programs allocate more than
-        the recommended 1K for the termcap entry; others do not.
- 
--       Each  termcap  entry has two important sizes associated with it: before
--       "tc" expansion, and after "tc" expansion.  "tc" is the capability  that
-+       Each termcap entry has two important sizes associated with  it:  before
-+       "tc"  expansion, and after "tc" expansion.  "tc" is the capability that
-        tacks on another termcap entry to the end of the current one, to add on
-        its capabilities.  If a termcap entry does not use the "tc" capability,
-        then of course the two lengths are the same.
- 
--       The  "before tc expansion" length is the most important one, because it
--       affects more than just users of that particular terminal.  This is  the
--       length  of the entry as it exists in /etc/termcap, minus the backslash-
-+       The "before tc expansion" length is the most important one, because  it
-+       affects  more than just users of that particular terminal.  This is the
-+       length of the entry as it exists in /etc/termcap, minus the  backslash-
-        newline pairs, which tgetent strips out while reading it.  Some termcap
-        libraries strip off the final newline, too (GNU termcap does not).  Now
-        suppose:
-@@ -2372,87 +2380,87 @@
- 
-        o   and the application has only allocated a 1k buffer,
- 
--       o   and the termcap library (like the one in BSD/OS 1.1 and GNU)  reads
--           the  whole entry into the buffer, no matter what its length, to see
-+       o   and  the termcap library (like the one in BSD/OS 1.1 and GNU) reads
-+           the whole entry into the buffer, no matter what its length, to  see
-            if it is the entry it wants,
- 
--       o   and tgetent is searching for a terminal type  that  either  is  the
--           long  entry,  appears  in the termcap file after the long entry, or
--           does not appear in the file at all (so that tgetent has  to  search
-+       o   and  tgetent  is  searching  for a terminal type that either is the
-+           long entry, appears in the termcap file after the  long  entry,  or
-+           does  not  appear in the file at all (so that tgetent has to search
-            the whole termcap file).
- 
--       Then  tgetent  will  overwrite  memory, perhaps its stack, and probably
--       core dump the program.  Programs like telnet are particularly  vulnera-
--       ble;  modern telnets pass along values like the terminal type automati-
--       cally.  The results are almost as undesirable with a  termcap  library,
--       like  SunOS  4.1.3 and Ultrix 4.4, that prints warning messages when it
--       reads an overly long termcap entry.  If  a  termcap  library  truncates
--       long  entries,  like  OSF/1  3.0,  it  is immune to dying here but will
-+       Then tgetent will overwrite memory, perhaps  its  stack,  and  probably
-+       core  dump the program.  Programs like telnet are particularly vulnera-
-+       ble; modern telnets pass along values like the terminal type  automati-
-+       cally.   The  results are almost as undesirable with a termcap library,
-+       like SunOS 4.1.3 and Ultrix 4.4, that prints warning messages  when  it
-+       reads  an  overly  long  termcap entry.  If a termcap library truncates
-+       long entries, like OSF/1 3.0, it is  immune  to  dying  here  but  will
-        return incorrect data for the terminal.
- 
--       The "after tc expansion" length will  have  a  similar  effect  to  the
-+       The  "after  tc  expansion"  length  will  have a similar effect to the
-        above, but only for people who actually set TERM to that terminal type,
--       since tgetent only does "tc" expansion once it is  found  the  terminal
-+       since  tgetent  only  does "tc" expansion once it is found the terminal
-        type it was looking for, not while searching.
- 
--       In  summary,  a termcap entry that is longer than 1023 bytes can cause,
--       on various combinations of termcap libraries and applications,  a  core
--       dump,  warnings, or incorrect operation.  If it is too long even before
--       "tc" expansion, it will have this effect even for users of  some  other
--       terminal  types  and  users whose TERM variable does not have a termcap
-+       In summary, a termcap entry that is longer than 1023 bytes  can  cause,
-+       on  various  combinations of termcap libraries and applications, a core
-+       dump, warnings, or incorrect operation.  If it is too long even  before
-+       "tc"  expansion,  it will have this effect even for users of some other
-+       terminal types and users whose TERM variable does not  have  a  termcap
-        entry.
- 
--       When in -C (translate to termcap) mode, the ncurses  implementation  of
--       tic(1m)  issues  warning  messages  when the pre-tc length of a termcap
--       translation is too long.  The -c (check) option  also  checks  resolved
-+       When  in  -C (translate to termcap) mode, the ncurses implementation of
-+       tic(1m) issues warning messages when the pre-tc  length  of  a  termcap
-+       translation  is  too  long.  The -c (check) option also checks resolved
-        (after tc expansion) lengths.
- 
- 
-

    Binary Compatibility

    --       It  is  not  wise  to  count  on portability of binary terminfo entries
--       between commercial UNIX versions.  The problem is  that  there  are  at
--       least  two  versions  of  terminfo (under HP-UX and AIX) which diverged
--       from System V terminfo after SVr1, and have added  extension  capabili-
--       ties  to the string table that (in the binary format) collide with Sys-
-+       It is not wise to count  on  portability  of  binary  terminfo  entries
-+       between  commercial  UNIX  versions.   The problem is that there are at
-+       least two versions of terminfo (under HP-UX  and  AIX)  which  diverged
-+       from  System  V terminfo after SVr1, and have added extension capabili-
-+       ties to the string table that (in the binary format) collide with  Sys-
-        tem V and XSI Curses extensions.
- 
- 
-

    EXTENSIONS

    --       Searching  for  terminal  descriptions  in  $HOME/.terminfo  and   TER-
-+       Searching   for  terminal  descriptions  in  $HOME/.terminfo  and  TER-
-        MINFO_DIRS is not supported by older implementations.
- 
--       Some  SVr4  curses  implementations,  and  all previous to SVr4, do not
-+       Some SVr4 curses implementations, and all  previous  to  SVr4,  do  not
-        interpret the %A and %O operators in parameter strings.
- 
--       SVr4/XPG4 do not specify whether msgr licenses  movement  while  in  an
--       alternate-character-set  mode  (such modes may, among other things, map
--       CR and NL to characters  that  do  not  trigger  local  motions).   The
--       ncurses  implementation  ignores  msgr in ALTCHARSET mode.  This raises
--       the possibility that an XPG4 implementation making the opposite  inter-
--       pretation  may  need  terminfo  entries  made  for ncurses to have msgr
-+       SVr4/XPG4  do  not  specify  whether msgr licenses movement while in an
-+       alternate-character-set mode (such modes may, among other  things,  map
-+       CR  and  NL  to  characters  that  do  not trigger local motions).  The
-+       ncurses implementation ignores msgr in ALTCHARSET  mode.   This  raises
-+       the  possibility that an XPG4 implementation making the opposite inter-
-+       pretation may need terminfo entries  made  for  ncurses  to  have  msgr
-        turned off.
- 
-        The ncurses library handles insert-character and insert-character modes
--       in  a  slightly  non-standard way to get better update efficiency.  See
-+       in a slightly non-standard way to get better  update  efficiency.   See
-        the Insert/Delete Character subsection above.
- 
--       The parameter substitutions for set_clock  and  display_clock  are  not
--       documented  in  SVr4 or the XSI Curses standard.  They are deduced from
-+       The  parameter  substitutions  for  set_clock and display_clock are not
-+       documented in SVr4 or the XSI Curses standard.  They are  deduced  from
-        the documentation for the AT&T 505 terminal.
- 
--       Be careful assigning the kmous capability.  The ncurses  library  wants
--       to  interpret  it as KEY_MOUSE, for use by terminals and emulators like
--       xterm that can return mouse-tracking information in the  keyboard-input
-+       Be  careful  assigning the kmous capability.  The ncurses library wants
-+       to interpret it as KEY_MOUSE, for use by terminals and  emulators  like
-+       xterm  that can return mouse-tracking information in the keyboard-input
-        stream.
- 
--       X/Open  Curses  does  not  mention italics.  Portable applications must
--       assume that  numeric  capabilities  are  signed  16-bit  values.   This
--       includes  the  no_color_video  (ncv)  capability.  The 32768 mask value
--       used for italics with ncv can be confused with an absent  or  cancelled
--       ncv.   If  italics  should work with colors, then the ncv value must be
-+       X/Open Curses does not mention  italics.   Portable  applications  must
-+       assume  that  numeric  capabilities  are  signed  16-bit  values.  This
-+       includes the no_color_video (ncv) capability.   The  32768  mask  value
-+       used  for  italics with ncv can be confused with an absent or cancelled
-+       ncv.  If italics should work with colors, then the ncv  value  must  be
-        specified, even if it is zero.
- 
--       Different commercial ports of terminfo  and  curses  support  different
-+       Different  commercial  ports  of  terminfo and curses support different
-        subsets of the XSI Curses standard and (in some cases) different exten-
-        sion sets.  Here is a summary, accurate as of October 1995:
- 
-@@ -2462,15 +2470,15 @@
-            capability (set_pglen).
- 
-        o   SVr1, Ultrix -- These support a restricted subset of terminfo capa-
--           bilities.  The  booleans  end  with  xon_xoff;  the  numerics  with
-+           bilities.   The  booleans  end  with  xon_xoff;  the  numerics with
-            width_status_line; and the strings with prtr_non.
- 
--       o   HP/UX  --  Supports  the  SVr1  subset,  plus the SVr[234] numerics
--           num_labels,  label_height,  label_width,  plus  function  keys   11
--           through  63,  plus  plab_norm,  label_on,  and label_off, plus some
-+       o   HP/UX -- Supports the  SVr1  subset,  plus  the  SVr[234]  numerics
-+           num_labels,   label_height,  label_width,  plus  function  keys  11
-+           through 63, plus plab_norm,  label_on,  and  label_off,  plus  some
-            incompatible extensions in the string table.
- 
--       o   AIX -- Supports the SVr1 subset, plus function keys 11 through  63,
-+       o   AIX  -- Supports the SVr1 subset, plus function keys 11 through 63,
-            plus a number of incompatible string table extensions.
- 
-        o   OSF -- Supports both the SVr4 set and the AIX extensions.
-@@ -2481,7 +2489,7 @@
- 
- 
-

    SEE ALSO

    --       tabs(1),  tic(1m),  infocmp(1m), curses(3x), curs_color(3x), curs_vari-
-+       tabs(1), tic(1m), infocmp(1m), curses(3x),  curs_color(3x),  curs_vari-
-        ables(3x), printf(3), term(5).  term_variables(3x).  user_caps(5).
- 
- 
-Index: doc/html/man/tic.1m.html
---- ncurses-6.1-20190720+/doc/html/man/tic.1m.html	2019-07-20 18:53:15.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/tic.1m.html	2019-07-26 23:48:29.000000000 +0000
-@@ -438,7 +438,7 @@
-        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-        term(5).  terminfo(5).  user_caps(5).
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/toe.1m.html
---- ncurses-6.1-20190720+/doc/html/man/toe.1m.html	2019-07-20 19:10:50.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/toe.1m.html	2019-07-26 23:48:30.000000000 +0000
-@@ -170,7 +170,7 @@
-        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
-        minfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.1-20190720+/doc/html/man/tput.1.html	2019-07-20 18:53:15.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/tput.1.html	2019-07-26 23:48:30.000000000 +0000
-@@ -522,7 +522,7 @@
-

    SEE ALSO

    -        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.1-20190720+/doc/html/man/tset.1.html	2019-07-20 18:53:15.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/man/tset.1.html	2019-07-26 23:48:30.000000000 +0000
-@@ -389,7 +389,7 @@
-        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
-        ttys(5), environ(7)
- 
--       This describes ncurses version 6.1 (patch 20190720).
-+       This describes ncurses version 6.1 (patch 20190727).
- 
- 
- 
-Index: doc/html/ncurses-intro.html
-Prereq:  1.48 
---- ncurses-6.1-20190720+/doc/html/ncurses-intro.html	2019-03-16 19:39:05.000000000 +0000
-+++ ncurses-6.1-20190727/doc/html/ncurses-intro.html	2019-07-27 11:47:10.000000000 +0000
-@@ -1,5 +1,5 @@
- 
- 
- 
-@@ -125,7 +125,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20190914+/doc/html/man/captoinfo.1m.html	2019-07-26 23:48:24.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/captoinfo.1m.html	2019-09-21 23:49:50.000000000 +0000
-@@ -190,7 +190,7 @@
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/clear.1.html
---- ncurses-6.1-20190914+/doc/html/man/clear.1.html	2019-07-26 23:48:24.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/clear.1.html	2019-09-21 23:49:50.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.1-20190914+/doc/html/man/form.3x.html	2019-07-26 23:48:27.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/form.3x.html	2019-09-21 23:49:52.000000000 +0000
-@@ -246,7 +246,7 @@
-        curses(3x)  and  related  pages  whose names begin "form_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.1-20190914+/doc/html/man/infocmp.1m.html	2019-07-26 23:48:28.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/infocmp.1m.html	2019-09-21 23:49:52.000000000 +0000
-@@ -512,7 +512,7 @@
- 
-        https://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/infotocap.1m.html
---- ncurses-6.1-20190914+/doc/html/man/infotocap.1m.html	2019-07-26 23:48:28.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/infotocap.1m.html	2019-09-21 23:49:52.000000000 +0000
-@@ -85,7 +85,7 @@
-

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/menu.3x.html
---- ncurses-6.1-20190914+/doc/html/man/menu.3x.html	2019-07-26 23:48:28.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/menu.3x.html	2019-09-21 23:49:53.000000000 +0000
-@@ -221,7 +221,7 @@
-        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.1-20190914+/doc/html/man/ncurses.3x.html	2019-07-26 23:48:29.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/ncurses.3x.html	2019-09-21 23:49:53.000000000 +0000
-@@ -59,7 +59,7 @@
-        method of updating  character  screens  with  reasonable  optimization.
-        This  implementation  is  "new  curses"  (ncurses)  and is the approved
-        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
-        The  ncurses  library emulates the curses library of System V Release 4
-        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-Index: doc/html/man/ncurses6-config.1.html
---- ncurses-6.1-20190914+/doc/html/man/ncurses6-config.1.html	2019-07-26 23:48:29.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/ncurses6-config.1.html	2019-09-21 23:49:53.000000000 +0000
-@@ -112,7 +112,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.1-20190914+/doc/html/man/panel.3x.html	2019-07-26 23:48:29.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/panel.3x.html	2019-09-21 23:49:54.000000000 +0000
-@@ -204,7 +204,7 @@
-

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/resizeterm.3x.html
---- ncurses-6.1-20190914+/doc/html/man/resizeterm.3x.html	2019-03-16 19:34:46.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/resizeterm.3x.html	2019-09-21 23:49:54.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -74,32 +74,41 @@
- 
-

    resize_term

    -        Most  of the work is done by the inner function resize_term.  The outer
--       function resizeterm adds bookkeeping for the  SIGWINCH  handler.   When
--       resizing  the  windows,  resize_term  blank-fills  the  areas  that are
-+       function resizeterm adds bookkeeping for the SIGWINCH handler, as  well
-+       as repainting the soft-key area (see slk_touch(3x)).
-+
-+       When  resizing  the windows, resize_term blank-fills the areas that are
-        extended.  The calling application should  fill  in  these  areas  with
--       appropriate data.  The resize_term function attempts to resize all win-
--       dows.  However, due to the calling convention of pads, it is not possi-
--       ble  to  resize  these without additional interaction with the applica-
--       tion.
-+       appropriate data.
-+
-+       The  resize_term function attempts to resize all windows.  However, due
-+       to the calling convention of pads, it is not possible to  resize  these
-+       without additional interaction with the application.
-+
-+       When  resizing  windows,  resize_term  recursively  adjusts subwindows,
-+       keeping them within the updated parent window's limits.  If a top-level
-+       window  happens  to extend to the screen's limits, then on resizing the
-+       window, resize_term will keep the window extending to the corresponding
-+       limit, regardless of whether the screen has shrunk or grown.
- 
- 
-

    is_term_resized

    -        A support function is_term_resized is provided so that applications can
--       check  if  the resize_term function would modify the window structures.
-+       check if the resize_term function would modify the  window  structures.
-        It returns TRUE if the windows would be modified, and FALSE otherwise.
- 
- 
-

    RETURN VALUE

    --       Except as noted, these functions return the integer  ERR  upon  failure
-+       Except  as  noted,  these functions return the integer ERR upon failure
-        and OK on success.  They will fail if either of the dimensions are less
--       than or equal to zero, or if an error occurs while (re)allocating  mem-
-+       than  or equal to zero, or if an error occurs while (re)allocating mem-
-        ory for the windows.
- 
- 
-

    NOTES

    --       While  these functions are intended to be used to support a signal han-
--       dler (i.e., for SIGWINCH), care should be taken to avoid invoking  them
--       in  a  context where malloc or realloc may have been interrupted, since
-+       While these functions are intended to be used to support a signal  han-
-+       dler  (i.e., for SIGWINCH), care should be taken to avoid invoking them
-+       in a context where malloc or realloc may have been  interrupted,  since
-        it uses those functions.
- 
-        If ncurses is configured to supply its own SIGWINCH handler,
-@@ -113,17 +122,17 @@
-        o   which ungetch's a KEY_RESIZE which will be read on the next call to
-            wgetch.
- 
--           The  KEY_RESIZE  alerts  an  application  that  the screen size has
--           changed, and that it should repaint special features such  as  pads
-+           The KEY_RESIZE alerts an  application  that  the  screen  size  has
-+           changed,  and  that it should repaint special features such as pads
-            that cannot be done automatically.
- 
-            Calling resizeterm or resize_term directly from a signal handler is
--           unsafe.  This indirect method is used to  provide  a  safe  way  to
-+           unsafe.   This  indirect  method  is  used to provide a safe way to
-            resize the ncurses data structures.
- 
--       If  the  environment variables LINES or COLUMNS are set, this overrides
--       the library's use of the window size obtained from the  operating  sys-
--       tem.   Thus,  even if a SIGWINCH is received, no screen size change may
-+       If the environment variables LINES or COLUMNS are set,  this  overrides
-+       the  library's  use of the window size obtained from the operating sys-
-+       tem.  Thus, even if a SIGWINCH is received, no screen size  change  may
-        be recorded.
- 
- 
-@@ -136,7 +145,7 @@
- 
-        Doing that clears the screen and is visually distracting.
- 
--       This extension of ncurses was introduced in mid-1995.  It  was  adopted
-+       This  extension  of ncurses was introduced in mid-1995.  It was adopted
-        in NetBSD curses (2001) and PDCurses (2003).
- 
- 
-@@ -145,7 +154,7 @@
- 
- 
-

    AUTHOR

    --       Thomas  Dickey  (from  an  equivalent  function written in 1988 for BSD
-+       Thomas Dickey (from an equivalent function  written  in  1988  for  BSD
-        curses).
- 
- 
-Index: doc/html/man/tabs.1.html
---- ncurses-6.1-20190914+/doc/html/man/tabs.1.html	2019-07-26 23:48:29.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/tabs.1.html	2019-09-21 23:49:54.000000000 +0000
-@@ -205,7 +205,7 @@
-

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.1-20190914+/doc/html/man/terminfo.5.html	2019-07-27 20:27:54.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/terminfo.5.html	2019-09-21 23:49:54.000000000 +0000
-@@ -103,7 +103,7 @@
-        have, by specifying how to perform screen operations, and by specifying
-        padding requirements and initialization sequences.
- 
--       This manual describes ncurses version 6.1 (patch 20190727).
-+       This manual describes ncurses version 6.1 (patch 20190921).
- 
- 
-

    Terminfo Entry Syntax

    -Index: doc/html/man/tic.1m.html
---- ncurses-6.1-20190914+/doc/html/man/tic.1m.html	2019-07-26 23:48:29.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/tic.1m.html	2019-09-21 23:49:54.000000000 +0000
-@@ -438,7 +438,7 @@
-        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-        term(5).  terminfo(5).  user_caps(5).
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/toe.1m.html
---- ncurses-6.1-20190914+/doc/html/man/toe.1m.html	2019-07-26 23:48:30.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/toe.1m.html	2019-09-21 23:49:54.000000000 +0000
-@@ -170,7 +170,7 @@
-        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
-        minfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.1-20190914+/doc/html/man/tput.1.html	2019-07-26 23:48:30.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/tput.1.html	2019-09-21 23:49:54.000000000 +0000
-@@ -522,7 +522,7 @@
-

    SEE ALSO

    -        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.1-20190914+/doc/html/man/tset.1.html	2019-07-26 23:48:30.000000000 +0000
-+++ ncurses-6.1-20190921/doc/html/man/tset.1.html	2019-09-21 23:49:54.000000000 +0000
-@@ -389,7 +389,7 @@
-        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
-        ttys(5), environ(7)
- 
--       This describes ncurses version 6.1 (patch 20190727).
-+       This describes ncurses version 6.1 (patch 20190921).
- 
- 
- 
-Index: man/resizeterm.3x
-Prereq:  1.25 
---- ncurses-6.1-20190914+/man/resizeterm.3x	2018-07-28 22:20:54.000000000 +0000
-+++ ncurses-6.1-20190921/man/resizeterm.3x	2019-09-21 23:44:41.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
- .\"
- .\" Author: Thomas E. Dickey 1996-on
- .\"
--.\" $Id: resizeterm.3x,v 1.25 2018/07/28 22:20:54 tom Exp $
-+.\" $Id: resizeterm.3x,v 1.26 2019/09/21 23:44:41 tom Exp $
- .TH resizeterm 3X ""
- .de bP
- .ie n  .IP \(bu 4
-@@ -61,14 +61,24 @@
- .PP
- Most of the work is done by the inner function \fBresize_term\fR.
- The outer function \fBresizeterm\fR adds bookkeeping
--for the \fBSIGWINCH\fP handler.
-+for the \fBSIGWINCH\fP handler,
-+as well as repainting the soft-key area (see \fBslk_touch\fP(3X)).
-+.PP
- When resizing the windows,
- \fBresize_term\fR blank-fills the areas that are extended.
- The calling application should fill in these areas with appropriate data.
-+.PP
- The \fBresize_term\fR function attempts to resize all windows.
- However, due to the calling convention of pads,
- it is not possible to resize these
- without additional interaction with the application.
-+.PP
-+When resizing windows, \fBresize_term\fR recursively adjusts subwindows,
-+keeping them within the updated parent window's limits.
-+If a top-level window happens to extend to the screen's limits,
-+then on resizing the window, \fBresize_term\fR will keep the window
-+extending to the corresponding limit, regardless of whether the
-+screen has shrunk or grown.
- .SS is_term_resized
- .PP
- A support function \fBis_term_resized\fR is provided so that applications
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20190914+/package/debian-mingw/changelog	2019-09-14 13:43:52.000000000 +0000
-+++ ncurses-6.1-20190921/package/debian-mingw/changelog	2019-09-21 14:56:20.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190914) unstable; urgency=low
-+ncurses6 (6.1+20190921) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 14 Sep 2019 09:43:52 -0400
-+ -- Thomas E. Dickey   Sat, 21 Sep 2019 10:56:20 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20190914+/package/debian-mingw64/changelog	2019-09-14 13:43:52.000000000 +0000
-+++ ncurses-6.1-20190921/package/debian-mingw64/changelog	2019-09-21 14:56:20.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190914) unstable; urgency=low
-+ncurses6 (6.1+20190921) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 14 Sep 2019 09:43:52 -0400
-+ -- Thomas E. Dickey   Sat, 21 Sep 2019 10:56:20 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20190914+/package/debian/changelog	2019-09-14 13:43:52.000000000 +0000
-+++ ncurses-6.1-20190921/package/debian/changelog	2019-09-21 14:56:20.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190914) unstable; urgency=low
-+ncurses6 (6.1+20190921) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 14 Sep 2019 09:43:52 -0400
-+ -- Thomas E. Dickey   Sat, 21 Sep 2019 10:56:20 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.351 
---- ncurses-6.1-20190914+/package/mingw-ncurses.nsi	2019-09-14 13:43:52.000000000 +0000
-+++ ncurses-6.1-20190921/package/mingw-ncurses.nsi	2019-09-21 14:56:20.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.351 2019/09/14 13:43:52 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.352 2019/09/21 14:56:20 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "0914"
-+!define VERSION_MMDD  "0921"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20190914+/package/mingw-ncurses.spec	2019-09-14 13:43:52.000000000 +0000
-+++ ncurses-6.1-20190921/package/mingw-ncurses.spec	2019-09-21 14:56:20.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20190914
-+Release: 20190921
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20190914+/package/ncurses.spec	2019-09-14 13:43:52.000000000 +0000
-+++ ncurses-6.1-20190921/package/ncurses.spec	2019-09-21 14:56:20.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20190914
-+Release: 20190921
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20190914+/package/ncursest.spec	2019-09-14 13:43:52.000000000 +0000
-+++ ncurses-6.1-20190921/package/ncursest.spec	2019-09-21 14:56:20.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20190914
-+Release: 20190921
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20190928.patch b/ncurses-6.1-20190928.patch
deleted file mode 100644
index b7b6d2b..0000000
--- a/ncurses-6.1-20190928.patch
+++ /dev/null
@@ -1,922 +0,0 @@
-# ncurses 6.1 - patch 20190928 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190928.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sat Sep 28 15:09:31 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                             |   10 ++
-# VERSION                          |    2 
-# aclocal.m4                       |   72 ++++++++++++++++++++
-# configure                        |  106 +++++++++++++++++++++++++----
-# configure.in                     |    7 +
-# dist.mk                          |    4 -
-# misc/gen-pkgconfig.in            |   39 +++++------
-# misc/ncurses-config.in           |  131 +++++++++++++++++++++++++++++--------
-# misc/terminfo.src                |   11 +--
-# package/debian-mingw/changelog   |    4 -
-# package/debian-mingw64/changelog |    4 -
-# package/debian/changelog         |    4 -
-# package/mingw-ncurses.nsi        |    4 -
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# package/ncursest.spec            |    2 
-# test/ncurses.c                   |   10 +-
-# 17 files changed, 325 insertions(+), 89 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3376 
---- ncurses-6.1-20190921+/NEWS	2019-09-21 23:47:04.000000000 +0000
-+++ ncurses-6.1-20190928/NEWS	2019-09-28 12:57:39.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3376 2019/09/21 23:47:04 tom Exp $
-+-- $Id: NEWS,v 1.3380 2019/09/28 12:57:39 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,14 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20190928
-+	+ amend the ncurse*-config and pc-files to take into account the rpath
-+	  hack which differed between those files.
-+	+ improve -L option filtering in ncurses*-config
-+	+ improve recovery from error when reading command-character in
-+	  test/ncurses.c, showing the relevant error message and not exiting on
-+	  EINTR (cf: 20180922)
-+
- 20190921
- 	+ add a note in resizeterm manpage about top-level windows which touch
- 	  the screen's borders.
-Index: VERSION
---- ncurses-6.1-20190921+/VERSION	2019-09-21 14:56:20.000000000 +0000
-+++ ncurses-6.1-20190928/VERSION	2019-09-27 18:43:59.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20190921
-+5:0:10	6.1	20190928
-Index: aclocal.m4
-Prereq:  1.883 
---- ncurses-6.1-20190921+/aclocal.m4	2019-09-21 22:11:35.000000000 +0000
-+++ ncurses-6.1-20190928/aclocal.m4	2019-09-27 21:08:36.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.883 2019/09/21 22:11:35 tom Exp $
-+dnl $Id: aclocal.m4,v 1.884 2019/09/27 21:08:36 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -3850,6 +3850,76 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_LD_SEARCHPATH version: 2 updated: 2019/09/26 20:34:14
-+dnl ----------------
-+dnl Try to obtain the linker's search-path, for use in scripts.
-+dnl
-+dnl Ignore LD_LIBRARY_PATH, etc.
-+AC_DEFUN([CF_LD_SEARCHPATH],[
-+AC_CACHE_CHECK(for linker search path,cf_cv_ld_searchpath,[
-+
-+if test "$cross_compiling" != yes ; then
-+
-+# GNU binutils' ld does not involve permissions which may stop ldconfig.
-+cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[[("=]][[("=]]*,,g' -e 's/"[[)]];//gp' | sort -u`
-+
-+# The -NX options tell newer versions of Linux ldconfig to not attempt to
-+# update the cache, which makes it run faster.
-+test -z "$cf_pathlist" && \
-+	cf_pathlist=`ldconfig -NX -v 2>/dev/null | sed -e '/^[[ 	]]/d' -e 's/:$//' | sort -u`
-+
-+test -z "$cf_pathlist" &&
-+	cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e '/^[[ 	]]/d' -e 's/:$//p' | sort -u`
-+
-+# This works with OpenBSD 6.5, which lists only filenames
-+test -z "$cf_pathlist" &&
-+	cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*[$],\1,p' | sort -u`
-+
-+if test -z "$cf_pathlist"
-+then
-+	# dyld default path with MacOS
-+	if test -f /usr/bin/otool && test "x`uname -s`" = xDarwin
-+	then
-+		# do this to bypass check
-+		cf_cv_ld_searchpath='$HOME/lib'
-+		cf_pathlist="/usr/local/lib /lib /usr/lib"
-+	fi
-+fi
-+
-+if test -z "$cf_pathlist"
-+then
-+	# Solaris is hardcoded
-+	if test -d /opt/SUNWspro/lib
-+	then
-+		cf_pathlist="/opt/SUNWspro/lib /usr/ccs/lib /usr/lib"
-+	elif test -d /usr/ccs/lib
-+	then
-+		cf_pathlist="/usr/ccs/lib /usr/lib"
-+	fi
-+fi
-+
-+fi
-+
-+# If nothing else, assume it is conventional
-+test -z "$cf_pathlist" && cf_pathlist="/usr/lib /lib"
-+
-+# Finally, check that this is only directories
-+for cf_path in [$]0 $cf_pathlist
-+do
-+	if test -d "$cf_path"; then
-+		test -n "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath="${cf_cv_ld_searchpath} "
-+		cf_cv_ld_searchpath="${cf_cv_ld_searchpath}${cf_path}"
-+	fi
-+done
-+
-+# Ensure that it is nonempty
-+test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
-+])
-+
-+LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
-+AC_SUBST(LD_SEARCHPATH)
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
- dnl ---------------
- dnl Construct a search-list of directories for a nonstandard library-file
-Index: configure
---- ncurses-6.1-20190921+/configure	2019-09-21 19:49:24.000000000 +0000
-+++ ncurses-6.1-20190928/configure	2019-09-27 22:50:51.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.689 .
-+# From configure.in Revision: 1.690 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20190901.
- #
-@@ -26022,6 +26022,77 @@
- 	CHECK_BUILD=
- fi
- 
-+# This is used for the *-config script and *.pc data files.
-+
-+echo "$as_me:26027: checking for linker search path" >&5
-+echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
-+if test "${cf_cv_ld_searchpath+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "$cross_compiling" != yes ; then
-+
-+# GNU binutils' ld does not involve permissions which may stop ldconfig.
-+cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[("=][("=]*,,g' -e 's/"[)];//gp' | sort -u`
-+
-+# The -NX options tell newer versions of Linux ldconfig to not attempt to
-+# update the cache, which makes it run faster.
-+test -z "$cf_pathlist" && \
-+	cf_pathlist=`ldconfig -NX -v 2>/dev/null | sed -e '/^[ 	]/d' -e 's/:$//' | sort -u`
-+
-+test -z "$cf_pathlist" &&
-+	cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e '/^[ 	]/d' -e 's/:$//p' | sort -u`
-+
-+# This works with OpenBSD 6.5, which lists only filenames
-+test -z "$cf_pathlist" &&
-+	cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*$,\1,p' | sort -u`
-+
-+if test -z "$cf_pathlist"
-+then
-+	# dyld default path with MacOS
-+	if test -f /usr/bin/otool && test "x`uname -s`" = xDarwin
-+	then
-+		# do this to bypass check
-+		cf_cv_ld_searchpath='$HOME/lib'
-+		cf_pathlist="/usr/local/lib /lib /usr/lib"
-+	fi
-+fi
-+
-+if test -z "$cf_pathlist"
-+then
-+	# Solaris is hardcoded
-+	if test -d /opt/SUNWspro/lib
-+	then
-+		cf_pathlist="/opt/SUNWspro/lib /usr/ccs/lib /usr/lib"
-+	elif test -d /usr/ccs/lib
-+	then
-+		cf_pathlist="/usr/ccs/lib /usr/lib"
-+	fi
-+fi
-+
-+fi
-+
-+# If nothing else, assume it is conventional
-+test -z "$cf_pathlist" && cf_pathlist="/usr/lib /lib"
-+
-+# Finally, check that this is only directories
-+for cf_path in $0 $cf_pathlist
-+do
-+	if test -d "$cf_path"; then
-+		test -n "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath="${cf_cv_ld_searchpath} "
-+		cf_cv_ld_searchpath="${cf_cv_ld_searchpath}${cf_path}"
-+	fi
-+done
-+
-+# Ensure that it is nonempty
-+test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
-+
-+fi
-+echo "$as_me:26091: result: $cf_cv_ld_searchpath" >&5
-+echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
-+
-+LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
-+
- cat >>confdefs.h <<\EOF
- #define HAVE_CURSES_DATA_BOOLNAMES 1
- EOF
-@@ -26107,7 +26178,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:26110: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:26181: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -26283,7 +26354,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:26286: error: ambiguous option: $1
-+    { { echo "$as_me:26357: 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;}
-@@ -26302,7 +26373,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:26305: error: unrecognized option: $1
-+  -*) { { echo "$as_me:26376: 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;}
-@@ -26421,7 +26492,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:26424: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:26495: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -26784,6 +26855,7 @@
- s,@ADAGEN_LDFLAGS@,$ADAGEN_LDFLAGS,;t t
- s,@CHECK_BUILD@,$CHECK_BUILD,;t t
- s,@PRIVATE_LIBS@,$PRIVATE_LIBS,;t t
-+s,@LD_SEARCHPATH@,$LD_SEARCHPATH,;t t
- CEOF
- 
- EOF
-@@ -26916,7 +26988,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:26919: creating $ac_file" >&5
-+    { echo "$as_me:26991: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -26934,7 +27006,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:26937: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:27009: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -26947,7 +27019,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:26950: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:27022: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -26963,7 +27035,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:26966: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:27038: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -26972,7 +27044,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:26975: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:27047: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -27009,7 +27081,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:27012: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:27084: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -27020,7 +27092,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:27023: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:27095: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -27069,7 +27141,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:27072: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:27144: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -27080,7 +27152,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:27083: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:27155: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -27093,7 +27165,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:27096: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:27168: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -27151,7 +27223,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:27154: $ac_file is unchanged" >&5
-+      { echo "$as_me:27226: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -27496,7 +27568,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:27499: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:27571: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: configure.in
-Prereq:  1.689 
---- ncurses-6.1-20190921+/configure.in	2019-09-07 20:06:52.000000000 +0000
-+++ ncurses-6.1-20190928/configure.in	2019-09-27 21:12:34.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.689 2019/09/07 20:06:52 tom Exp $
-+dnl $Id: configure.in,v 1.690 2019/09/27 21:12:34 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See https://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20170501)
--AC_REVISION($Revision: 1.689 $)
-+AC_REVISION($Revision: 1.690 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -2391,6 +2391,9 @@
- AC_SUBST(CHECK_BUILD)
- AC_SUBST(PRIVATE_LIBS)
- 
-+# This is used for the *-config script and *.pc data files.
-+CF_LD_SEARCHPATH
-+
- AC_DEFINE(HAVE_CURSES_DATA_BOOLNAMES,1,[definition needed for in-tree build of tack])
- 
- AC_OUTPUT( \
-Index: dist.mk
-Prereq:  1.1306 
---- ncurses-6.1-20190921+/dist.mk	2019-09-21 14:56:20.000000000 +0000
-+++ ncurses-6.1-20190928/dist.mk	2019-09-27 18:43:59.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1306 2019/09/21 14:56:20 tom Exp $
-+# $Id: dist.mk,v 1.1307 2019/09/27 18:43:59 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20190921
-+NCURSES_PATCH = 20190928
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: misc/gen-pkgconfig.in
-Prereq:  1.34 
---- ncurses-6.1-20190921+/misc/gen-pkgconfig.in	2018-06-09 22:21:33.000000000 +0000
-+++ ncurses-6.1-20190928/misc/gen-pkgconfig.in	2019-09-28 12:53:53.000000000 +0000
-@@ -1,7 +1,7 @@
- #!@SHELL@
--# $Id: gen-pkgconfig.in,v 1.34 2018/06/09 22:21:33 tom Exp $
-+# $Id: gen-pkgconfig.in,v 1.36 2019/09/28 12:53:53 tom Exp $
- ##############################################################################
--# Copyright (c) 2009-2015,2018 Free Software Foundation, Inc.                #
-+# Copyright (c) 2009-2018,2019 Free 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"), #
-@@ -46,6 +46,7 @@
- DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
- TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
- CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
-+RPATH_LIST=@RPATH_LIST@
- PRIVATE_LIBS="@PRIVATE_LIBS@"
- 
- suffix=@PC_MODULE_SUFFIX@
-@@ -66,10 +67,10 @@
- FORM_LIBRARY="${FORM_NAME}@USE_ARG_SUFFIX@"
- 
- CFLAGS="@PKG_CFLAGS@"
--if test "$includedir" != "/usr/include" ; then
-+if [ "$includedir" != "/usr/include" ]; then
- 	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
--	test "$includetop" = "/usr/include" && includetop="$includedir"
--	if test "x$includetop" != "x$includedir"
-+	[ "$includetop" = "/usr/include" ] && includetop="$includedir"
-+	if [ "x$includetop" != "x$includedir" ]
- 	then
- 		CFLAGS="$CFLAGS -I${includetop}"
- 	fi
-@@ -77,10 +78,10 @@
- fi
- 
- LDFLAGS=
--if test "$libdir" != "/usr/lib" ; then
-+if [ "$libdir" != "/usr/lib" ]; then
- 	LDFLAGS="$LDFLAGS -L\${libdir}"
- fi
--if test "x@EXTRA_LDFLAGS@" != "x" ; then
-+if [ "x@EXTRA_LDFLAGS@" != "x" ]; then
- 	LDFLAGS="$LDFLAGS @EXTRA_LDFLAGS@"
- fi
- 
-@@ -88,8 +89,8 @@
- # functions or curses variables (which also reside in tinfo) can be linked
- # using the -lncurses option.
- NEED_TINFO=no
--if test "x@TINFO_LIBS@" != "x" && \
--   test "x$TINFO_ARG_SUFFIX" != "x$MAIN_LIBRARY"
-+if [ "x@TINFO_LIBS@" != "x" ] && \
-+   [ "x$TINFO_ARG_SUFFIX" != "x$MAIN_LIBRARY" ]
- then
- 	NEED_TINFO=yes
- fi
-@@ -102,10 +103,10 @@
- 	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
- 	reqs=
- 
--	if test $name = $MAIN_LIBRARY ; then
-+	if [ $name = $MAIN_LIBRARY ]; then
- 		desc="$desc library"
--		test $NEED_TINFO = yes && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
--	elif test $name = $SUB_LIBRARY ; then
-+		[ $NEED_TINFO = yes ] && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
-+	elif [ $name = $SUB_LIBRARY ]; then
- 		desc="$desc terminal interface library"
- 	elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
- 		reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
-@@ -115,15 +116,15 @@
- 		desc="$desc add-on library"
- 	fi
- 
--	if test $name != $SUB_LIBRARY && \
--	   test $SUB_LIBRARY != $MAIN_LIBRARY && \
--	   test $name != $TINFO_NAME && \
--	   test $NEED_TINFO != yes ; then
--		test -n "$reqs" && reqs="$reqs, "
-+	if [ $name != $SUB_LIBRARY ] && \
-+	   [ $SUB_LIBRARY != $MAIN_LIBRARY ] && \
-+	   [ $name != $TINFO_NAME ] && \
-+	   [ $NEED_TINFO != yes ] ; then
-+		[ -n "$reqs" ] && reqs="$reqs, "
- 		reqs="${reqs}${SUB_LIBRARY}${suffix}"
- 	fi
- 
--	if test $name = $MAIN_LIBRARY
-+	if [ $name = $MAIN_LIBRARY ]
- 	then
- 		main_libs="$PRIVATE_LIBS"
- 	else
-@@ -154,4 +155,4 @@
- EOF
- 
- done
--# vile:shmode
-+# vile:shmode ts=4 sw=4
-Index: misc/ncurses-config.in
-Prereq:  1.37 
---- ncurses-6.1-20190921+/misc/ncurses-config.in	2018-06-09 22:29:01.000000000 +0000
-+++ ncurses-6.1-20190928/misc/ncurses-config.in	2019-09-28 12:54:17.000000000 +0000
-@@ -1,7 +1,7 @@
- #!@SHELL@
--# $Id: ncurses-config.in,v 1.37 2018/06/09 22:29:01 tom Exp $
-+# $Id: ncurses-config.in,v 1.39 2019/09/28 12:54:17 tom Exp $
- ##############################################################################
--# Copyright (c) 2006-2017,2018 Free Software Foundation, Inc.                #
-+# Copyright (c) 2006-2018,2019 Free 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"), #
-@@ -54,7 +54,7 @@
- # Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
- # We cannot filter it out within the build-process since the variable is used
- # in some special cases of installation using a relative path.
--if test -n "$RPATH_LIST"
-+if [ -n "$RPATH_LIST" ]
- then
- 	save_IFS="$IFS"
- 	IFS='@PATH_SEPARATOR@'
-@@ -65,7 +65,7 @@
- 		./*|../*|*/..|*/../*)
- 			;;
- 		*)
--			test -n "$filtered" && filtered="${filtered}@PATH_SEPARATOR@"
-+			[ -n "$filtered" ] && filtered="${filtered}@PATH_SEPARATOR@"
- 			filtered="${filtered}${item}"
- 			;;
- 		esac
-@@ -78,7 +78,7 @@
- # with --disable-overwrite, we installed into a subdirectory, but transformed
- # the headers to include like this:
- #	
--if test x@WITH_OVERWRITE@ = xno ; then
-+if [ x@WITH_OVERWRITE@ = xno ]; then
- 	case $includedir in
- 	$prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@)
- 		includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
-@@ -86,9 +86,50 @@
- 	esac
- fi
- 
--test $# = 0 && exec @SHELL@ $0 --error
-+LIBS="@LIBS@ @PRIVATE_LIBS@"
-+if [ "@TINFO_NAME@" = "@LIB_NAME@" ]; then
-+	LIBS="-l${THIS} $LIBS"
-+else
-+	LIBS="-l${THIS} -l${TINFO_LIB} $LIBS"
-+fi
-+
-+# Ignore -L options which do not correspond to an actual directory, or which
-+# are standard library directories (i.e., the linker is supposed to search
-+# those directories).
-+#
-+# There is no portable way to find the list of standard library directories. 
-+# Require a POSIX shell anyway, to keep this simple.
-+lib_flags=
-+for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
-+do
-+	case $opt in
-+	-L*)
-+		[ -d ${opt##-L} ] || continue
-+		case ${opt##-L} in
-+		@LD_SEARCHPATH@) # skip standard libdir
-+			continue
-+			;;
-+		*)
-+			found=no
-+			for check in $lib_flags
-+			do
-+				if [ "x$check" = "x$opt" ]
-+				then
-+					found=yes
-+					break
-+				fi
-+			done
-+			[ $found = yes ] && continue
-+			;;
-+		esac
-+		;;
-+	esac
-+	lib_flags="$lib_flags $opt"
-+done
- 
--while test $# -gt 0; do
-+[ $# = 0 ] && exec @SHELL@ $0 --error
-+
-+while [ $# -gt 0 ]; do
- 	case "$1" in
- 	# basic configuration
- 	--prefix)
-@@ -100,10 +141,10 @@
- 	# compile/link
- 	--cflags)
- 		INCS="@PKG_CFLAGS@"
--		if test "x@WITH_OVERWRITE@" = xno ; then
-+		if [ "x@WITH_OVERWRITE@" = xno ]; then
- 			INCS="$INCS -I${includesubdir}"
- 		fi
--		if test "${includedir}" != /usr/include ; then
-+		if [ "${includedir}" != /usr/include ]; then
- 			INCS="$INCS -I${includedir}"
- 		fi
- 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-@@ -111,22 +152,54 @@
- ENDECHO
- 		;;
- 	--libs)
--		if test "$libdir" = /usr/lib
--		then
--			LIBDIR=
--		else
--			LIBDIR=-L$libdir
--		fi
--		LIBS="@LIBS@ @PRIVATE_LIBS@"
--		if test @TINFO_NAME@ = @LIB_NAME@ ; then
--		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
--			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} $LIBS
--ENDECHO
--		else
--		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
--			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} $LIBS
--ENDECHO
--		fi
-+		OPTS=
-+		for opt in $lib_flags
-+		do
-+			[ -n "$OPTS" ] && OPTS="$OPTS "
-+			OPTS="${OPTS}${opt}"
-+		done
-+		printf "%s\n" "$OPTS"
-+		;;
-+	--libs-only-L)
-+		OPTS=
-+		for opt in $lib_flags
-+		do
-+			case "x$opt" in
-+			x-L*)
-+				[ -n "$OPTS" ] && OPTS="$OPTS "
-+				OPTS="${OPTS}${opt}"
-+				;;
-+			esac
-+		done
-+		printf "%s\n" "$OPTS"
-+		;;
-+	--libs-only-l)
-+		OPTS=
-+		for opt in $lib_flags
-+		do
-+			case "x$opt" in
-+			x-l*)
-+				[ -n "$OPTS" ] && OPTS="$OPTS "
-+				OPTS="${OPTS}${opt}"
-+				;;
-+			esac
-+		done
-+		printf "%s\n" "$OPTS"
-+		;;
-+	--libs-only-other)
-+		OPTS=
-+		for opt in $lib_flags
-+		do
-+			case "x$opt" in
-+			x-[lL]*)
-+				;;
-+			*)
-+				[ -n "$OPTS" ] && OPTS="$OPTS "
-+				OPTS="${OPTS}${opt}"
-+				;;
-+			esac
-+		done
-+		printf "%s\n" "$OPTS"
- 		;;
- 	# identification
- 	--version)
-@@ -147,9 +220,9 @@
- 		;;
- 	--includedir)
- 		INCS=
--		if test "x@WITH_OVERWRITE@" = xno ; then
-+		if [ "x@WITH_OVERWRITE@" = xno ]; then
- 			INCS="${includesubdir}"
--		elif test "${includedir}" != /usr/include ; then
-+		elif [ "${includedir}" != /usr/include ]; then
- 			INCS="${includedir}"
- 		fi
- 		echo $INCS
-@@ -181,6 +254,10 @@
-   --cflags           echos the C compiler flags needed to compile with ${THIS}
-   --libs             echos the libraries needed to link with ${THIS}
- 
-+  --libs-only-L      echos -L linker options (search path) for ${THIS}
-+  --libs-only-l      echos -l linker options (libraries) for ${THIS}
-+  --libs-only-other  echos linker options other than -L/-l
-+
-   --version          echos the release+patchdate version of ${THIS}
-   --abi-version      echos the ABI version of ${THIS}
-   --mouse-version    echos the mouse-interface version of ${THIS}
-Index: misc/terminfo.src
---- ncurses-6.1-20190921+/misc/terminfo.src	2019-08-03 21:42:15.000000000 +0000
-+++ ncurses-6.1-20190928/misc/terminfo.src	2019-09-22 18:48:45.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.763 $
--#	$Date: 2019/08/03 21:42:15 $
-+#	$Revision: 1.765 $
-+#	$Date: 2019/09/22 18:48:45 $
- #
- # 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
-@@ -3292,7 +3292,7 @@
- # tracked under rdar://problem/7365108 and rdar://problem/7365134
- # in Apple's bug reporter.
- #
--# In OS X 10.7 (Leopard) the TERM which can be set in the preferences dialog
-+# In OS X 10.5 (Leopard) the TERM which can be set in the preferences dialog
- # defaults to xterm-color.  Alternative selections are ansi, dtterm, rxvt,
- # vt52, vt100, vt102 and xterm.
- nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5,
-@@ -3364,7 +3364,7 @@
- 
- # This is tested with OS X 10.8 (Mountain Lion), 2012/08/11
- #	TERM_PROGRAM_VERSION=309
--# Earlier reports state that these differences also apply to OS X 10.7 (Leopard),
-+# Earlier reports state that these differences also apply to OS X 10.7 (Lion),
- #	TERM_PROGRAM_VERSION=303
- nsterm-build309|Terminal.app in OS X 10.8,
- 	use=xterm+256setaf, use=nsterm-bce,
-@@ -26372,4 +26372,7 @@
- #	+ updated alacritty+common entry & notes -TD
- #	+ use xterm+sl-twm for consistency -TD
- #
-+# 2019-09-22
-+#	+ correct a comment -TD
-+#
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20190921+/package/debian-mingw/changelog	2019-09-21 14:56:20.000000000 +0000
-+++ ncurses-6.1-20190928/package/debian-mingw/changelog	2019-09-27 18:43:59.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190921) unstable; urgency=low
-+ncurses6 (6.1+20190928) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 21 Sep 2019 10:56:20 -0400
-+ -- Thomas E. Dickey   Sun, 22 Sep 2019 14:43:59 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20190921+/package/debian-mingw64/changelog	2019-09-21 14:56:20.000000000 +0000
-+++ ncurses-6.1-20190928/package/debian-mingw64/changelog	2019-09-27 18:43:59.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190921) unstable; urgency=low
-+ncurses6 (6.1+20190928) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 21 Sep 2019 10:56:20 -0400
-+ -- Thomas E. Dickey   Sun, 22 Sep 2019 14:43:59 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20190921+/package/debian/changelog	2019-09-21 14:56:20.000000000 +0000
-+++ ncurses-6.1-20190928/package/debian/changelog	2019-09-27 18:43:59.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190921) unstable; urgency=low
-+ncurses6 (6.1+20190928) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 21 Sep 2019 10:56:20 -0400
-+ -- Thomas E. Dickey   Sun, 22 Sep 2019 14:43:59 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.352 
---- ncurses-6.1-20190921+/package/mingw-ncurses.nsi	2019-09-21 14:56:20.000000000 +0000
-+++ ncurses-6.1-20190928/package/mingw-ncurses.nsi	2019-09-27 18:43:59.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.352 2019/09/21 14:56:20 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.353 2019/09/27 18:43:59 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "0921"
-+!define VERSION_MMDD  "0928"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20190921+/package/mingw-ncurses.spec	2019-09-21 14:56:20.000000000 +0000
-+++ ncurses-6.1-20190928/package/mingw-ncurses.spec	2019-09-27 18:43:59.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20190921
-+Release: 20190928
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20190921+/package/ncurses.spec	2019-09-21 14:56:20.000000000 +0000
-+++ ncurses-6.1-20190928/package/ncurses.spec	2019-09-27 18:43:59.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20190921
-+Release: 20190928
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20190921+/package/ncursest.spec	2019-09-21 14:56:20.000000000 +0000
-+++ ncurses-6.1-20190928/package/ncursest.spec	2019-09-27 18:43:59.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20190921
-+Release: 20190928
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/ncurses.c
-Prereq:  1.518 
---- ncurses-6.1-20190921+/test/ncurses.c	2019-08-31 23:22:40.000000000 +0000
-+++ ncurses-6.1-20190928/test/ncurses.c	2019-09-22 19:12:40.000000000 +0000
-@@ -40,7 +40,7 @@
-    Author: Eric S. Raymond  1993
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.518 2019/08/31 23:22:40 tom Exp $
-+$Id: ncurses.c,v 1.519 2019/09/22 19:12:40 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -7815,11 +7815,13 @@
- 	for (;;) {
- 	    char ch = '\0';
- 	    if (read(fileno(stdin), &ch, (size_t) 1) <= 0) {
--		if (command == 0)
--		    command = 'q';
--		if (errno == EINTR) {
-+		int save_err = errno;
-+		perror("\nOOPS");
-+		if (save_err == EINTR) {
- 		    clearerr(stdin);
- 		    continue;
-+		} else if (command == 0) {
-+		    command = 'q';
- 		}
- 		break;
- 	    } else if (command == 0 && !isspace(UChar(ch))) {
diff --git a/ncurses-6.1-20191005.patch b/ncurses-6.1-20191005.patch
deleted file mode 100644
index bd7c87d..0000000
--- a/ncurses-6.1-20191005.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-# ncurses 6.1 - patch 20191005 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191005.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Oct  6 00:58:27 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                             |    6 +++++-
-# VERSION                          |    2 +-
-# dist.mk                          |    4 ++--
-# misc/gen-pkgconfig.in            |    5 +++--
-# misc/ncurses-config.in           |    4 ++--
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# package/ncursest.spec            |    2 +-
-# 12 files changed, 24 insertions(+), 19 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3380 
---- ncurses-6.1-20190928+/NEWS	2019-09-28 12:57:39.000000000 +0000
-+++ ncurses-6.1-20191005/NEWS	2019-10-05 22:53:18.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3380 2019/09/28 12:57:39 tom Exp $
-+-- $Id: NEWS,v 1.3382 2019/10/05 22:53:18 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,10 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191005
-+	+ modify the ncurse*-config and pc-files to more closely match for the
-+	  -I and -l options.
-+
- 20190928
- 	+ amend the ncurse*-config and pc-files to take into account the rpath
- 	  hack which differed between those files.
-Index: VERSION
---- ncurses-6.1-20190928+/VERSION	2019-09-27 18:43:59.000000000 +0000
-+++ ncurses-6.1-20191005/VERSION	2019-10-05 14:44:23.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20190928
-+5:0:10	6.1	20191005
-Index: dist.mk
-Prereq:  1.1307 
---- ncurses-6.1-20190928+/dist.mk	2019-09-27 18:43:59.000000000 +0000
-+++ ncurses-6.1-20191005/dist.mk	2019-10-05 14:44:23.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1307 2019/09/27 18:43:59 tom Exp $
-+# $Id: dist.mk,v 1.1308 2019/10/05 14:44:23 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20190928
-+NCURSES_PATCH = 20191005
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: misc/gen-pkgconfig.in
-Prereq:  1.36 
---- ncurses-6.1-20190928+/misc/gen-pkgconfig.in	2019-09-28 12:53:53.000000000 +0000
-+++ ncurses-6.1-20191005/misc/gen-pkgconfig.in	2019-10-05 22:25:47.000000000 +0000
-@@ -1,5 +1,5 @@
- #!@SHELL@
--# $Id: gen-pkgconfig.in,v 1.36 2019/09/28 12:53:53 tom Exp $
-+# $Id: gen-pkgconfig.in,v 1.38 2019/10/05 22:25:47 tom Exp $
- ##############################################################################
- # Copyright (c) 2009-2018,2019 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -70,11 +70,11 @@
- if [ "$includedir" != "/usr/include" ]; then
- 	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
- 	[ "$includetop" = "/usr/include" ] && includetop="$includedir"
-+	CFLAGS="$CFLAGS -I\${includedir}"
- 	if [ "x$includetop" != "x$includedir" ]
- 	then
- 		CFLAGS="$CFLAGS -I${includetop}"
- 	fi
--	CFLAGS="$CFLAGS -I\${includedir}"
- fi
- 
- LDFLAGS=
-@@ -106,6 +106,7 @@
- 	if [ $name = $MAIN_LIBRARY ]; then
- 		desc="$desc library"
- 		[ $NEED_TINFO = yes ] && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
-+		[ -n "@LIBS@" ] && LIBS="$LIBS @LIBS@"
- 	elif [ $name = $SUB_LIBRARY ]; then
- 		desc="$desc terminal interface library"
- 	elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
-Index: misc/ncurses-config.in
-Prereq:  1.39 
---- ncurses-6.1-20190928+/misc/ncurses-config.in	2019-09-28 12:54:17.000000000 +0000
-+++ ncurses-6.1-20191005/misc/ncurses-config.in	2019-10-05 22:24:20.000000000 +0000
-@@ -1,5 +1,5 @@
- #!@SHELL@
--# $Id: ncurses-config.in,v 1.39 2019/09/28 12:54:17 tom Exp $
-+# $Id: ncurses-config.in,v 1.40 2019/10/05 22:24:20 tom Exp $
- ##############################################################################
- # Copyright (c) 2006-2018,2019 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -86,7 +86,7 @@
- 	esac
- fi
- 
--LIBS="@LIBS@ @PRIVATE_LIBS@"
-+LIBS="@LIBS@"
- if [ "@TINFO_NAME@" = "@LIB_NAME@" ]; then
- 	LIBS="-l${THIS} $LIBS"
- else
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20190928+/package/debian-mingw/changelog	2019-09-27 18:43:59.000000000 +0000
-+++ ncurses-6.1-20191005/package/debian-mingw/changelog	2019-10-05 14:44:23.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190928) unstable; urgency=low
-+ncurses6 (6.1+20191005) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 22 Sep 2019 14:43:59 -0400
-+ -- Thomas E. Dickey   Sat, 05 Oct 2019 10:44:23 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20190928+/package/debian-mingw64/changelog	2019-09-27 18:43:59.000000000 +0000
-+++ ncurses-6.1-20191005/package/debian-mingw64/changelog	2019-10-05 14:44:23.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190928) unstable; urgency=low
-+ncurses6 (6.1+20191005) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 22 Sep 2019 14:43:59 -0400
-+ -- Thomas E. Dickey   Sat, 05 Oct 2019 10:44:23 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20190928+/package/debian/changelog	2019-09-27 18:43:59.000000000 +0000
-+++ ncurses-6.1-20191005/package/debian/changelog	2019-10-05 14:44:23.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20190928) unstable; urgency=low
-+ncurses6 (6.1+20191005) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sun, 22 Sep 2019 14:43:59 -0400
-+ -- Thomas E. Dickey   Sat, 05 Oct 2019 10:44:23 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.353 
---- ncurses-6.1-20190928+/package/mingw-ncurses.nsi	2019-09-27 18:43:59.000000000 +0000
-+++ ncurses-6.1-20191005/package/mingw-ncurses.nsi	2019-10-05 14:44:23.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.353 2019/09/27 18:43:59 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.354 2019/10/05 14:44:23 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "0928"
-+!define VERSION_MMDD  "1005"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20190928+/package/mingw-ncurses.spec	2019-09-27 18:43:59.000000000 +0000
-+++ ncurses-6.1-20191005/package/mingw-ncurses.spec	2019-10-05 14:44:23.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20190928
-+Release: 20191005
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20190928+/package/ncurses.spec	2019-09-27 18:43:59.000000000 +0000
-+++ ncurses-6.1-20191005/package/ncurses.spec	2019-10-05 14:44:23.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20190928
-+Release: 20191005
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20190928+/package/ncursest.spec	2019-09-27 18:43:59.000000000 +0000
-+++ ncurses-6.1-20191005/package/ncursest.spec	2019-10-05 14:44:23.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20190928
-+Release: 20191005
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20191012.patch b/ncurses-6.1-20191012.patch
deleted file mode 100644
index bb8f057..0000000
--- a/ncurses-6.1-20191012.patch
+++ /dev/null
@@ -1,1359 +0,0 @@
-# ncurses 6.1 - patch 20191012 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191012.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Oct 13 01:25:51 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                                  |   18 +-
-# VERSION                               |    2 
-# dist.mk                               |    4 
-# doc/html/man/adacurses6-config.1.html |    2 
-# doc/html/man/captoinfo.1m.html        |   17 +
-# doc/html/man/clear.1.html             |    2 
-# doc/html/man/form.3x.html             |    2 
-# doc/html/man/infocmp.1m.html          |    2 
-# doc/html/man/infotocap.1m.html        |   12 +
-# doc/html/man/menu.3x.html             |    2 
-# doc/html/man/ncurses.3x.html          |    2 
-# doc/html/man/ncurses6-config.1.html   |    2 
-# doc/html/man/panel.3x.html            |    2 
-# doc/html/man/tabs.1.html              |    2 
-# doc/html/man/terminfo.5.html          |    2 
-# doc/html/man/tic.1m.html              |  275 +++++++++++++++++---------------
-# doc/html/man/toe.1m.html              |    2 
-# doc/html/man/tput.1.html              |    2 
-# doc/html/man/tset.1.html              |    2 
-# man/captoinfo.1m                      |   12 +
-# man/infotocap.1m                      |    6 
-# man/tic.1m                            |   72 +++++---
-# misc/gen-pkgconfig.in                 |   44 ++++-
-# misc/ncurses-config.in                |    5 
-# ncurses/tinfo/comp_hash.c             |   14 +
-# ncurses/tinfo/parse_entry.c           |   32 +--
-# package/debian-mingw/changelog        |    4 
-# package/debian-mingw64/changelog      |    4 
-# package/debian/changelog              |    4 
-# package/mingw-ncurses.nsi             |    4 
-# package/mingw-ncurses.spec            |    2 
-# package/ncurses.spec                  |    2 
-# package/ncursest.spec                 |    2 
-# progs/dump_entry.c                    |    7 
-# 34 files changed, 346 insertions(+), 222 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3382 
---- ncurses-6.1-20191005+/NEWS	2019-10-05 22:53:18.000000000 +0000
-+++ ncurses-6.1-20191012/NEWS	2019-10-12 21:17:50.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3382 2019/10/05 22:53:18 tom Exp $
-+-- $Id: NEWS,v 1.3389 2019/10/12 21:17:50 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,12 +45,26 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191012
-+	+ amend recent changes to ncurses*-config and pc-files to filter out
-+	  Debian linker-flags (report by Sven Joachim, cf: 20150516).
-+	+ clarify relationship between tic, infocmp and captoinfo in manpage.
-+	+ check for invalid hashcode in _nc_find_type_entry and
-+	  _nc_find_name_entry.
-+	> fix several errata in tic (reports/testcases by "zjuchenyuan"):
-+	+ check for invalid hashcode in _nc_find_entry.
-+	+ check for missing character after backslash in fmt_entry
-+	+ check for acsc with odd length in dump_entry in check for one-one
-+	  mapping (cf: 20060415);
-+	+ check length when converting from old AIX box_chars_1 capability,
-+	  overlooked in changes to eliminate strcpy (cf: 20001007).
-+
- 20191005
- 	+ modify the ncurse*-config and pc-files to more closely match for the
- 	  -I and -l options.
- 
- 20190928
--	+ amend the ncurse*-config and pc-files to take into account the rpath
-+	+ amend the ncurses*-config and pc-files to take into account the rpath
- 	  hack which differed between those files.
- 	+ improve -L option filtering in ncurses*-config
- 	+ improve recovery from error when reading command-character in
-Index: VERSION
---- ncurses-6.1-20191005+/VERSION	2019-10-05 14:44:23.000000000 +0000
-+++ ncurses-6.1-20191012/VERSION	2019-10-12 15:30:55.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191005
-+5:0:10	6.1	20191012
-Index: dist.mk
-Prereq:  1.1308 
---- ncurses-6.1-20191005+/dist.mk	2019-10-05 14:44:23.000000000 +0000
-+++ ncurses-6.1-20191012/dist.mk	2019-10-12 15:30:55.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1308 2019/10/05 14:44:23 tom Exp $
-+# $Id: dist.mk,v 1.1309 2019/10/12 15:30:55 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191005
-+NCURSES_PATCH = 20191012
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/adacurses6-config.1.html
---- ncurses-6.1-20191005+/doc/html/man/adacurses6-config.1.html	2019-09-21 23:49:50.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/adacurses6-config.1.html	2019-10-12 21:32:36.000000000 +0000
-@@ -125,7 +125,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20191005+/doc/html/man/captoinfo.1m.html	2019-09-21 23:49:50.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/captoinfo.1m.html	2019-10-12 21:32:36.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -183,14 +183,22 @@
-        This utility is actually a link to tic(1m), running in  -I  mode.   You
-        can use other tic options such as -f and  -x.
- 
--       The  trace  option  is not identical to SVr4's.  Under SVr4, instead of
-+       The  verbose option is not identical to SVr4's.  Under SVr4, instead of
-        following the -v with a trace level n, you repeat it n times.
- 
- 
-+

    PORTABILITY

    -+       X/Open Curses, Issue 7 (2009) describes tic  briefly,  but  omits  this
-+       program.  SVr4 systems provide captoinfo as a separate application from
-+       tic.
-+
-+       NetBSD does not provide this application.
-+
-+
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
-

    AUTHOR

    -@@ -209,6 +217,7 @@
- 
  • FILES
    • 
- 
  • TRANSLATIONS FROM NONSTANDARD CAPABILITIES
    • 
- 
  • NOTES
    • 
-+
  • PORTABILITY
    • 
- 
  • SEE ALSO
    • 
- 
  • AUTHOR
    • 
- 
-Index: doc/html/man/clear.1.html
---- ncurses-6.1-20191005+/doc/html/man/clear.1.html	2019-09-21 23:49:50.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/clear.1.html	2019-10-12 21:32:36.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.1-20191005+/doc/html/man/form.3x.html	2019-09-21 23:49:52.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/form.3x.html	2019-10-12 21:32:38.000000000 +0000
-@@ -246,7 +246,7 @@
-        curses(3x)  and  related  pages  whose names begin "form_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.1-20191005+/doc/html/man/infocmp.1m.html	2019-09-21 23:49:52.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/infocmp.1m.html	2019-10-12 21:32:39.000000000 +0000
-@@ -512,7 +512,7 @@
- 
-        https://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/infotocap.1m.html
---- ncurses-6.1-20191005+/doc/html/man/infotocap.1m.html	2019-09-21 23:49:52.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/infotocap.1m.html	2019-10-12 21:32:39.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-@@ -82,10 +82,15 @@
-        use other tic options such as -f and  -x.
- 
- 
-+

    PORTABILITY

    -+       None  of  X/Open  Curses,  Issue 7 (2009), SVr4 or NetBSD document this
-+       application.
-+
-+
-

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
-

    AUTHOR

    -@@ -103,6 +108,7 @@
- 
  • DESCRIPTION
    • 
- 
  • FILES
    • 
- 
  • NOTES
    • 
-+
  • PORTABILITY
    • 
- 
  • SEE ALSO
    • 
- 
  • AUTHOR
    • 
- 
-Index: doc/html/man/menu.3x.html
---- ncurses-6.1-20191005+/doc/html/man/menu.3x.html	2019-09-21 23:49:53.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/menu.3x.html	2019-10-12 21:32:39.000000000 +0000
-@@ -221,7 +221,7 @@
-        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.1-20191005+/doc/html/man/ncurses.3x.html	2019-09-21 23:49:53.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/ncurses.3x.html	2019-10-12 21:32:40.000000000 +0000
-@@ -59,7 +59,7 @@
-        method of updating  character  screens  with  reasonable  optimization.
-        This  implementation  is  "new  curses"  (ncurses)  and is the approved
-        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
-        The  ncurses  library emulates the curses library of System V Release 4
-        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-Index: doc/html/man/ncurses6-config.1.html
---- ncurses-6.1-20191005+/doc/html/man/ncurses6-config.1.html	2019-09-21 23:49:53.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/ncurses6-config.1.html	2019-10-12 21:32:40.000000000 +0000
-@@ -112,7 +112,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.1-20191005+/doc/html/man/panel.3x.html	2019-09-21 23:49:54.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/panel.3x.html	2019-10-12 21:32:40.000000000 +0000
-@@ -204,7 +204,7 @@
-

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/tabs.1.html
---- ncurses-6.1-20191005+/doc/html/man/tabs.1.html	2019-09-21 23:49:54.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/tabs.1.html	2019-10-12 21:32:40.000000000 +0000
-@@ -205,7 +205,7 @@
-

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.1-20191005+/doc/html/man/terminfo.5.html	2019-09-21 23:49:54.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/terminfo.5.html	2019-10-12 21:32:41.000000000 +0000
-@@ -103,7 +103,7 @@
-        have, by specifying how to perform screen operations, and by specifying
-        padding requirements and initialization sequences.
- 
--       This manual describes ncurses version 6.1 (patch 20190921).
-+       This manual describes ncurses version 6.1 (patch 20191012).
- 
- 
-

    Terminfo Entry Syntax

    -Index: doc/html/man/tic.1m.html
---- ncurses-6.1-20191005+/doc/html/man/tic.1m.html	2019-09-21 23:49:54.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/tic.1m.html	2019-10-12 21:32:41.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tic.1m,v 1.74 2019/07/20 17:57:09 tom Exp @
-+  * @Id: tic.1m,v 1.75 2019/10/12 20:56:38 tom Exp @
- -->
- 
- 
-@@ -106,46 +106,55 @@
-        o   the system terminfo database (/usr/share/terminfo).
- 
- 
-+

    ALIASES

    -+       This is the same program as infotocap and captoinfo; usually those  are
-+       linked to, or copied from this program:
-+
-+       o   When invoked as infotocap, tic sets the -I option.
-+
-+       o   When invoked as captoinfo, tic sets the -C option.
-+
-+
-

    OPTIONS

    -        -0     restricts the output to a single line
- 
-        -1     restricts the output to a single column
- 
--       -a     tells tic to retain commented-out capabilities rather than  dis-
-+       -a     tells  tic to retain commented-out capabilities rather than dis-
-               carding them.  Capabilities are commented by prefixing them with
--              a period.  This sets the -x option, because it treats  the  com-
--              mented-out  entries  as  user-defined  names.   If the source is
--              termcap, accept the 2-character names  required  by  version  6.
-+              a  period.   This sets the -x option, because it treats the com-
-+              mented-out entries as user-defined  names.   If  the  source  is
-+              termcap,  accept  the  2-character  names required by version 6.
-               Otherwise these are ignored.
- 
--       -C     Force  source translation to termcap format.  Note: this differs
--              from the -C option of infocmp(1m) in that  it  does  not  merely
-+       -C     Force source translation to termcap format.  Note: this  differs
-+              from  the  -C  option  of infocmp(1m) in that it does not merely
-               translate capability names, but also translates terminfo strings
--              to termcap format.  Capabilities that are not  translatable  are
--              left  in  the entry under their terminfo names but commented out
--              with two preceding dots.  The actual  format  used  incorporates
--              some  improvements  for escaped characters from terminfo format.
-+              to  termcap  format.  Capabilities that are not translatable are
-+              left in the entry under their terminfo names but  commented  out
-+              with  two  preceding  dots.  The actual format used incorporates
-+              some improvements for escaped characters from  terminfo  format.
-               For a stricter BSD-compatible translation, add the -K option.
- 
--              If this is combined with -c,  tic  makes  additional  checks  to
--              report  cases  where  the  terminfo  values do not have an exact
-+              If  this  is  combined  with  -c, tic makes additional checks to
-+              report cases where the terminfo values  do  not  have  an  exact
-               equivalent in termcap form.  For example:
- 
--              o   sgr usually will not  convert,  because  termcap  lacks  the
--                  ability  to  work with more than two parameters, and because
--                  termcap lacks many of the arithmetic/logical operators  used
-+              o   sgr  usually  will  not  convert,  because termcap lacks the
-+                  ability to work with more than two parameters,  and  because
-+                  termcap  lacks many of the arithmetic/logical operators used
-                   in terminfo.
- 
--              o   capabilities  with more than one delay or with delays before
-+              o   capabilities with more than one delay or with delays  before
-                   the end of the string will not convert completely.
- 
--       -c     tells tic to only check file for errors, including syntax  prob-
--              lems  and  bad  use-links.   If  you  specify  -C (-I) with this
--              option, the code will print warnings about entries which,  after
--              use  resolution, are more than 1023 (4096) bytes long.  Due to a
-+       -c     tells  tic to only check file for errors, including syntax prob-
-+              lems and bad use-links.   If  you  specify  -C  (-I)  with  this
-+              option,  the code will print warnings about entries which, after
-+              use resolution, are more than 1023 (4096) bytes long.  Due to  a
-               fixed buffer length in older termcap libraries, as well as buggy
--              checking  for  the buffer length (and a documented limit in ter-
--              minfo), these entries may cause core dumps with other  implemen-
-+              checking for the buffer length (and a documented limit  in  ter-
-+              minfo),  these entries may cause core dumps with other implemen-
-               tations.
- 
-               tic checks string capabilities to ensure that those with parame-
-@@ -153,29 +162,29 @@
-               predefined string capabilities; those which are defined with the
-               -x option are ignored.
- 
--       -D     tells tic to print the database locations that it  knows  about,
-+       -D     tells  tic  to print the database locations that it knows about,
-               and exit.  The first location shown is the one to which it would
--              write compiled terminal descriptions.  If tic  is  not  able  to
--              find  a writable database location according to the rules summa-
--              rized above, it will print a diagnostic and exit with  an  error
-+              write  compiled  terminal  descriptions.   If tic is not able to
-+              find a writable database location according to the rules  summa-
-+              rized  above,  it will print a diagnostic and exit with an error
-               rather than printing a list of database locations.
- 
-        -e names
--              Limit  writes  and translations to the following comma-separated
--              list of terminals.  If any name or alias of a  terminal  matches
--              one  of  the  names  in  the  list, the entry will be written or
-+              Limit writes and translations to the  following  comma-separated
-+              list  of  terminals.  If any name or alias of a terminal matches
-+              one of the names in the list,  the  entry  will  be  written  or
-               translated as normal.  Otherwise no output will be generated for
--              it.   The  option  value is interpreted as a file containing the
-+              it.  The option value is interpreted as a  file  containing  the
-               list if it contains a '/'.  (Note: depending on how tic was com-
-               piled, this option may require -I or -C.)
- 
--       -f     Display     complex     terminfo     strings    which    contain
-+       -f     Display    complex    terminfo     strings     which     contain
-               if/then/else/endif expressions indented for readability.
- 
--       -G     Display constant literals in  decimal  form  rather  than  their
-+       -G     Display  constant  literals  in  decimal  form rather than their
-               character equivalents.
- 
--       -g     Display  constant  character literals in quoted form rather than
-+       -g     Display constant character literals in quoted form  rather  than
-               their decimal equivalents.
- 
-        -I     Force source translation to terminfo format.
-@@ -183,24 +192,24 @@
-        -K     Suppress some longstanding ncurses extensions to termcap format,
-               e.g., "\s" for space.
- 
--       -L     Force  source  translation  to  terminfo format using the long C
-+       -L     Force source translation to terminfo format  using  the  long  C
-               variable names listed in <term.h>
- 
-        -N     Disable smart defaults.  Normally, when translating from termcap
--              to  terminfo,  the  compiler makes a number of assumptions about
--              the  defaults  of  string   capabilities   reset1_string,   car-
-+              to terminfo, the compiler makes a number  of  assumptions  about
-+              the   defaults   of   string  capabilities  reset1_string,  car-
-               riage_return,  cursor_left,  cursor_down,  scroll_forward,  tab,
-               newline, key_backspace, key_left, and key_down, then attempts to
--              use  obsolete termcap capabilities to deduce correct values.  It
-+              use obsolete termcap capabilities to deduce correct values.   It
-               also normally suppresses output of obsolete termcap capabilities
--              such  as bs.  This option forces a more literal translation that
-+              such as bs.  This option forces a more literal translation  that
-               also preserves the obsolete capabilities.
- 
--       -odir  Write compiled entries to given  database  location.   Overrides
-+       -odir  Write  compiled  entries  to given database location.  Overrides
-               the TERMINFO environment variable.
- 
--       -Qn    Rather  than  show  source  in terminfo (text) format, print the
--              compiled (binary) format in hexadecimal or base64 form,  depend-
-+       -Qn    Rather than show source in terminfo  (text)  format,  print  the
-+              compiled  (binary) format in hexadecimal or base64 form, depend-
-               ing on the option's value:
- 
-                1  hexadecimal
-@@ -213,35 +222,35 @@
-               source.
- 
-        -Rsubset
--              Restrict output to a given subset.  This option is for use  with
--              archaic  versions  of  terminfo  like  those on SVr1, Ultrix, or
--              HP/UX that do not support the full set of SVR4/XSI  Curses  ter-
--              minfo;  and  outright  broken ports like AIX 3.x that have their
--              own extensions incompatible with  SVr4/XSI.   Available  subsets
-+              Restrict  output to a given subset.  This option is for use with
-+              archaic versions of terminfo like  those  on  SVr1,  Ultrix,  or
-+              HP/UX  that  do not support the full set of SVR4/XSI Curses ter-
-+              minfo; and outright broken ports like AIX 3.x  that  have  their
-+              own  extensions  incompatible  with SVr4/XSI.  Available subsets
-               are "SVr1", "Ultrix", "HP", "BSD" and "AIX"; see terminfo(5) for
-               details.
- 
--       -r     Force entry resolution (so there are no remaining  tc  capabili-
--              ties)  even  when doing translation to termcap format.  This may
--              be needed if you are preparing a  termcap  file  for  a  termcap
--              library  (such as GNU termcap through version 1.3 or BSD termcap
--              through 4.3BSD) that does not handle  multiple  tc  capabilities
-+       -r     Force  entry  resolution (so there are no remaining tc capabili-
-+              ties) even when doing translation to termcap format.   This  may
-+              be  needed  if  you  are  preparing a termcap file for a termcap
-+              library (such as GNU termcap through version 1.3 or BSD  termcap
-+              through  4.3BSD)  that  does not handle multiple tc capabilities
-               per entry.
- 
--       -s     Summarize  the  compile  by  showing  the database location into
--              which entries are written, and the number of entries  which  are
-+       -s     Summarize the compile by  showing  the  database  location  into
-+              which  entries  are written, and the number of entries which are
-               compiled.
- 
--       -T     eliminates  size-restrictions  on  the  generated text.  This is
--              mainly useful for  testing  and  analysis,  since  the  compiled
--              descriptions  are limited (e.g., 1023 for termcap, 4096 for ter-
-+       -T     eliminates size-restrictions on the  generated  text.   This  is
-+              mainly  useful  for  testing  and  analysis,  since the compiled
-+              descriptions are limited (e.g., 1023 for termcap, 4096 for  ter-
-               minfo).
- 
--       -t     tells tic to discard commented-out capabilities.  Normally  when
--              translating  from  terminfo to termcap, untranslatable capabili-
-+       -t     tells  tic to discard commented-out capabilities.  Normally when
-+              translating from terminfo to termcap,  untranslatable  capabili-
-               ties are commented-out.
- 
--       -U   tells tic to not post-process the data after  parsing  the  source
-+       -U   tells  tic  to  not post-process the data after parsing the source
-             file.  Normally, it infers data which is commonly missing in older
-             terminfo data, or in termcaps.
- 
-@@ -251,9 +260,9 @@
-        -vn  specifies that (verbose) output be written to standard error trace
-             information showing tic's progress.
- 
--            The optional parameter n is a number  from  1  to  10,  inclusive,
-+            The  optional  parameter  n  is  a number from 1 to 10, inclusive,
-             indicating the desired level of detail of information.  If ncurses
--            is built  without  tracing  support,  the  optional  parameter  is
-+            is  built  without  tracing  support,  the  optional  parameter is
-             ignored.  If n is omitted, the default level is 1.  If n is speci-
-             fied and greater than 1, the level of detail is increased.
- 
-@@ -275,90 +284,90 @@
- 
-             If the debug level n is not given, it is taken to be one.
- 
--       -W   By itself, the -w  option  will  not  force  long  strings  to  be
-+       -W   By  itself,  the  -w  option  will  not  force  long strings to be
-             wrapped.  Use the -W option to do this.
- 
--            If  you specify both -f and -W options, the latter is ignored when
-+            If you specify both -f and -W options, the latter is ignored  when
-             -f has already split the line.
- 
-        -wn  specifies the width of the output.  The parameter is optional.  If
-             it is omitted, it defaults to 60.
- 
--       -x   Treat  unknown  capabilities  as  user-defined (see user_caps(5)).
-+       -x   Treat unknown capabilities  as  user-defined  (see  user_caps(5)).
-             That is, if you supply a capability name which tic does not recog-
--            nize,  it will infer its type (boolean, number or string) from the
--            syntax and make an extended table entry  for  that.   User-defined
-+            nize, it will infer its type (boolean, number or string) from  the
-+            syntax  and  make  an extended table entry for that.  User-defined
-             capability strings whose name begins with "k" are treated as func-
-             tion keys.
- 
- 
-

    PARAMETERS

    --       file   contains one or more terminfo terminal  descriptions  in  source
--              format   [see   terminfo(5)].   Each  description  in  the  file
-+       file   contains  one  or  more terminfo terminal descriptions in source
-+              format  [see  terminfo(5)].   Each  description  in   the   file
-               describes the capabilities of a particular terminal.
- 
--              If file is "-", then the data is read from the  standard  input.
-+              If  file  is "-", then the data is read from the standard input.
-               The file parameter may also be the path of a character-device.
- 
- 
-

    PROCESSING

    --       All  but  one  of  the capabilities recognized by tic are documented in
-+       All but one of the capabilities recognized by  tic  are  documented  in
-        terminfo(5).  The exception is the use capability.
- 
-        When a use=entry-name field is discovered in a terminal entry currently
--       being  compiled,  tic  reads  in the binary from /usr/share/terminfo to
--       complete the entry.  (Entries created from file  will  be  used  first.
--       tic  duplicates  the  capabilities in entry-name for the current entry,
-+       being compiled, tic reads in the  binary  from  /usr/share/terminfo  to
-+       complete  the  entry.   (Entries  created from file will be used first.
-+       tic duplicates the capabilities in entry-name for  the  current  entry,
-        with the exception of those capabilities that explicitly are defined in
-        the current entry.
- 
--       When  an  entry, e.g., entry_name_1, contains a use=entry_name_2 field,
--       any  canceled  capabilities  in  entry_name_2  must  also   appear   in
--       entry_name_1  before  use=  for  these  capabilities  to be canceled in
-+       When an entry, e.g., entry_name_1, contains a  use=entry_name_2  field,
-+       any   canceled   capabilities  in  entry_name_2  must  also  appear  in
-+       entry_name_1 before use= for  these  capabilities  to  be  canceled  in
-        entry_name_1.
- 
-        Total compiled entries cannot exceed 4096 bytes.  The name field cannot
--       exceed  512  bytes.   Terminal names exceeding the maximum alias length
-+       exceed 512 bytes.  Terminal names exceeding the  maximum  alias  length
-        (32 characters on systems with long filenames, 14 characters otherwise)
--       will  be  truncated  to  the maximum alias length and a warning message
-+       will be truncated to the maximum alias length  and  a  warning  message
-        will be printed.
- 
- 
-

    HISTORY

    --       System V Release 2 provided  a  tic  utility.   It  accepted  a  single
--       option:  -v  (optionally  followed  by  a  number).   According to Ross
-+       System  V  Release  2  provided  a  tic  utility.  It accepted a single
-+       option: -v (optionally  followed  by  a  number).   According  to  Ross
-        Ridge's comment in mytinfo, this version of tic was unable to represent
-        cancelled capabilities.
- 
--       System  V  Release 3 provided a different tic utility, written by Pavel
--       Curtis, (originally named "compile" in pcurses).  This added an  option
--       -c  to check the file for errors, with the caveat that errors in "use="
-+       System V Release 3 provided a different tic utility, written  by  Pavel
-+       Curtis,  (originally named "compile" in pcurses).  This added an option
-+       -c to check the file for errors, with the caveat that errors in  "use="
-        links would not be reported.  System V Release 3 documented a few warn-
-        ing messages which did not appear in pcurses.  While the program itself
--       was changed little as development continued with System  V  Release  4,
-+       was  changed  little  as development continued with System V Release 4,
-        the table of capabilities grew from 180 (pcurses) to 464 (Solaris).
- 
--       In  early  development of ncurses (1993), Zeyd Ben-Halim used the table
--       from mytinfo to extend the  pcurses  table  to  469  capabilities  (456
--       matched  SVr4, 8 were only in SVr4, 13 were not in SVr4).  Of those 13,
--       11 were ultimately discarded (perhaps to  match  the  draft  of  X/Open
--       Curses).   The exceptions were memory_lock_above and memory_unlock (see
-+       In early development of ncurses (1993), Zeyd Ben-Halim used  the  table
-+       from  mytinfo  to  extend  the  pcurses  table to 469 capabilities (456
-+       matched SVr4, 8 were only in SVr4, 13 were not in SVr4).  Of those  13,
-+       11  were  ultimately  discarded  (perhaps  to match the draft of X/Open
-+       Curses).  The exceptions were memory_lock_above and memory_unlock  (see
-        user_caps(5)).
- 
--       Eric Raymond incorporated parts of mytinfo into  ncurses  to  implement
--       the  termcap-to-terminfo  source conversion, and extended that to begin
-+       Eric  Raymond  incorporated  parts of mytinfo into ncurses to implement
-+       the termcap-to-terminfo source conversion, and extended that  to  begin
-        development of the corresponding terminfo-to-termcap source conversion,
--       Thomas  Dickey  completed  that  development over the course of several
-+       Thomas Dickey completed that development over  the  course  of  several
-        years.
- 
--       In 1999, Thomas Dickey added the  -x  option  to  support  user-defined
-+       In  1999,  Thomas  Dickey  added  the -x option to support user-defined
-        capabilities.
- 
--       In  2010,  Roy  Marples provided a tic program and terminfo library for
--       NetBSD.  This implementation  adapts  several  features  from  ncurses,
-+       In 2010, Roy Marples provided a tic program and  terminfo  library  for
-+       NetBSD.   That  implementation  adapts  several  features from ncurses,
-        including tic's -x option.
- 
--       The  -c  option  tells tic to check for problems in the terminfo source
-+       The -c option tells tic to check for problems in  the  terminfo  source
-        file.  Continued development provides additional checks:
- 
-        o   pcurses had 8 warnings
-@@ -373,57 +382,70 @@
- 
-        The checking done in ncurses' tic helps with the conversion to termcap,
-        as well as pointing out errors and inconsistencies.  It is also used to
--       ensure consistency with the user-defined capabilities.  There  are  527
--       distinct  capabilities  in ncurses' terminal database; 128 of those are
-+       ensure  consistency  with the user-defined capabilities.  There are 527
-+       distinct capabilities in ncurses' terminal database; 128 of  those  are
-        user-defined.
- 
- 
-

    PORTABILITY

    --       X/Open Curses, Issue 7 (2009) provides a brief description of tic.   It
--       lists  one  option:  -c.  The omission of -v is unexpected.  The change
--       history states that  the  description  is  derived  from  True64  UNIX.
--       According  to  its  manual  pages,  that  system  also supported the -v
-+       X/Open  Curses, Issue 7 (2009) provides a brief description of tic.  It
-+       lists one option: -c.  The omission of -v is  unexpected.   The  change
-+       history  states  that  the  description  is  derived  from True64 UNIX.
-+       According to its manual  pages,  that  system  also  supported  the  -v
-        option.
- 
--       Shortly after Issue 7 was released,  Tru64  was  discontinued.   As  of
--       2019,  the  surviving  implementations  of tic are SVr4 (AIX, HP-UX and
--       Solaris), ncurses and NetBSD curses.
--
--       The X/Open rationale states that some implementations of tic read  ter-
--       minal  descriptions  from  the  standard input if the file parameter is
--       omitted.  None of these implementations do that.  Further, it  comments
-+       Shortly  after  Issue  7  was  released, Tru64 was discontinued.  As of
-+       2019, the surviving implementations of tic are  SVr4  (AIX,  HP-UX  and
-+       Solaris), ncurses and NetBSD curses.  The SVr4 tic programs all support
-+       the -v option.  The NetBSD tic program follows X/Open's  documentation,
-+       omitting the -v option.
-+
-+       The  X/Open rationale states that some implementations of tic read ter-
-+       minal descriptions from the standard input if  the  file  parameter  is
-+       omitted.   None of these implementations do that.  Further, it comments
-        that some may choose to read from "./terminfo.src" but that is obsoles-
--       cent behavior from SVr2, and is not (for example) a documented  feature
-+       cent  behavior from SVr2, and is not (for example) a documented feature
-        of SVr3.
- 
- 
-

    COMPATIBILITY

    --       There  is  some  evidence  that  historic  tic  implementations treated
--       description fields with no whitespace in them as additional aliases  or
-+       There is  some  evidence  that  historic  tic  implementations  treated
-+       description  fields with no whitespace in them as additional aliases or
-        short names.  This tic does not do that, but it does warn when descrip-
--       tion fields may be treated that way and check them for dangerous  char-
-+       tion  fields may be treated that way and check them for dangerous char-
-        acters.
- 
- 
-

    EXTENSIONS

    --       Unlike  the  SVr4 tic command, this implementation can actually compile
--       termcap sources.  In fact, entries in terminfo and termcap  syntax  can
--       be  mixed  in  a  single  source file.  See terminfo(5) for the list of
-+       Unlike the SVr4 tic command, this implementation can  actually  compile
-+       termcap  sources.   In fact, entries in terminfo and termcap syntax can
-+       be mixed in a single source file.  See  terminfo(5)  for  the  list  of
-        termcap names taken to be equivalent to terminfo names.
- 
--       The SVr4 manual pages are not clear on the  resolution  rules  for  use
--       capabilities.   This  implementation  of tic will find use targets any-
--       where in the source file, or anywhere in the file tree rooted  at  TER-
--       MINFO  (if TERMINFO is defined), or in the user's $HOME/.terminfo data-
-+       The  SVr4  manual  pages  are not clear on the resolution rules for use
-+       capabilities.  This implementation of tic will find  use  targets  any-
-+       where  in  the source file, or anywhere in the file tree rooted at TER-
-+       MINFO (if TERMINFO is defined), or in the user's $HOME/.terminfo  data-
-        base (if it exists), or (finally) anywhere in the system's file tree of
-        compiled entries.
- 
--       The  error  messages  from this tic have the same format as GNU C error
-+       The error messages from this tic have the same format as  GNU  C  error
-        messages, and can be parsed by GNU Emacs's compile facility.
- 
--       The -0, -1, -C, -G, -I, -N, -R, -T, -V, -a, -e, -f, -g, -o, -r, -s,  -t
--       and -x options are not supported under SVr4.  The SVr4 -c mode does not
--       report bad "use=" links.
-+       Aside from -c and -v, options are not portable:
-+
-+       o   Most of tic's options are not supported by SVr4 tic:
-+
-+           -0 -1 -C -G -I -N -R -T -V -a -e -f -g -o -r -s -t -x
-+
-+       o   The NetBSD tic  supports a few of the ncurses options
-+
-+           -a -o -x
-+
-+           and  adds  -S  (a feature which does the same thing as infocmp's -e
-+           and -E options).
-+
-+       The SVr4 -c mode does not report bad "use=" links.
- 
-        System V does  not  compile  entries  to  or  read  entries  from  your
-        $HOME/.terminfo database unless TERMINFO is explicitly set to it.
-@@ -438,7 +460,7 @@
-        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-        term(5).  terminfo(5).  user_caps(5).
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
-

    AUTHOR

    -@@ -455,6 +477,7 @@
- 
  • SYNOPSIS
    • 
- 
  • DESCRIPTION
- 
      
-+
    • ALIASES
      • 
- 
    • OPTIONS
      • 
- 
    • PARAMETERS
      • 
- 
    • PROCESSING
      • 
-Index: doc/html/man/toe.1m.html
---- ncurses-6.1-20191005+/doc/html/man/toe.1m.html	2019-09-21 23:49:54.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/toe.1m.html	2019-10-12 21:32:41.000000000 +0000
-@@ -170,7 +170,7 @@
-        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
-        minfo(5).
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.1-20191005+/doc/html/man/tput.1.html	2019-09-21 23:49:54.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/tput.1.html	2019-10-12 21:32:41.000000000 +0000
-@@ -522,7 +522,7 @@
-

    • SEE ALSO

    -        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.1-20191005+/doc/html/man/tset.1.html	2019-09-21 23:49:54.000000000 +0000
-+++ ncurses-6.1-20191012/doc/html/man/tset.1.html	2019-10-12 21:32:41.000000000 +0000
-@@ -389,7 +389,7 @@
-        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
-        ttys(5), environ(7)
- 
--       This describes ncurses version 6.1 (patch 20190921).
-+       This describes ncurses version 6.1 (patch 20191012).
- 
- 
- 
-Index: man/captoinfo.1m
-Prereq:  1.27 
---- ncurses-6.1-20191005+/man/captoinfo.1m	2018-07-28 21:34:06.000000000 +0000
-+++ ncurses-6.1-20191012/man/captoinfo.1m	2019-10-12 21:10:00.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2016,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: captoinfo.1m,v 1.27 2018/07/28 21:34:06 tom Exp $
-+.\" $Id: captoinfo.1m,v 1.29 2019/10/12 21:10:00 tom Exp $
- .TH @CAPTOINFO@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
-@@ -183,9 +183,15 @@
- This utility is actually a link to \fB@TIC@\fR(1M), running in \fI\-I\fR mode.
- You can use other \fB@TIC@\fR options such as \fB\-f\fR and  \fB\-x\fR.
- .PP
--The trace option is not identical to SVr4's.
-+The verbose option is not identical to SVr4's.
- Under SVr4, instead of following
- the \fB\-v\fR with a trace level n, you repeat it n times.
-+.SH PORTABILITY
-+X/Open Curses, Issue 7 (2009) describes \fBtic\fP briefly,
-+but omits this program.
-+SVr4 systems provide \fBcaptoinfo\fP as a separate application from \fBtic\fP.
-+.PP
-+NetBSD does not provide this application.
- .SH SEE ALSO
- \fB@INFOCMP@\fR(1M),
- \fBcurses\fR(3X),
-Index: man/infotocap.1m
-Prereq:  1.13 
---- ncurses-6.1-20191005+/man/infotocap.1m	2018-07-28 21:34:06.000000000 +0000
-+++ ncurses-6.1-20191012/man/infotocap.1m	2019-10-12 21:16:00.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1999-2016,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1999-2018,2019 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: infotocap.1m,v 1.13 2018/07/28 21:34:06 tom Exp $
-+.\" $Id: infotocap.1m,v 1.15 2019/10/12 21:16:00 tom Exp $
- .TH @INFOTOCAP@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
-@@ -63,6 +63,8 @@
- .SH NOTES
- This utility is actually a link to \fB@TIC@\fR, running in \fI\-C\fR mode.
- You can use other \fB@TIC@\fR options such as \fB\-f\fR and  \fB\-x\fR.
-+.SH PORTABILITY
-+None of X/Open Curses, Issue 7 (2009), SVr4 or NetBSD document this application.
- .SH SEE ALSO
- \fBcurses\fR(3X),
- \fB@TIC@\fR(1M),
-Index: man/tic.1m
-Prereq:  1.74 
---- ncurses-6.1-20191005+/man/tic.1m	2019-07-20 17:57:09.000000000 +0000
-+++ ncurses-6.1-20191012/man/tic.1m	2019-10-12 20:56:38.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tic.1m,v 1.74 2019/07/20 17:57:09 tom Exp $
-+.\" $Id: tic.1m,v 1.75 2019/10/12 20:56:38 tom Exp $
- .TH @TIC@ 1M ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -128,6 +128,14 @@
- a compiled-in list of directories (@TERMINFO_DIRS@), and
- .bP
- the system terminfo database (\fI\*d\fR).
-+.SS ALIASES
-+.PP
-+This is the same program as @INFOTOCAP@ and @CAPTOINFO@;
-+usually those are linked to, or copied from this program:
-+.bP
-+When invoked as @INFOTOCAP@, @TIC@ sets the \fB\-I\fP option.
-+.bP
-+When invoked as @CAPTOINFO@, @TIC@ sets the \fB\-C\fP option.
- .SS OPTIONS
- .TP
- \fB\-0\fR
-@@ -443,7 +451,7 @@
- .PP
- In 2010, Roy Marples provided a \fBtic\fP program
- and terminfo library for NetBSD.
--This implementation adapts several features from ncurses,
-+That implementation adapts several features from ncurses,
- including \fB@TIC@\fP's \fB\-x\fP option.
- .PP
- The \fB\-c\fP option tells \fB@TIC@\fP to check for problems in the
-@@ -478,6 +486,9 @@
- are SVr4 (AIX, HP-UX and Solaris),
- ncurses
- and NetBSD curses.
-+The SVr4 \fBtic\fP programs all support the \fB\-v\fP option.
-+The NetBSD \fBtic\fP program follows X/Open's documentation,
-+omitting the \fB\-v\fP option.
- .PP
- The X/Open rationale states that some implementations of \fBtic\fP
- read terminal descriptions from the standard input if the \fIfile\fP
-@@ -514,27 +525,44 @@
- The error messages from this \fB@TIC@\fR have the same format as GNU C
- error messages, and can be parsed by GNU Emacs's compile facility.
- .PP
--The
--\fB\-0\fR,
--\fB\-1\fR,
--\fB\-C\fR,
--\fB\-G\fR,
--\fB\-I\fR,
--\fB\-N\fR,
--\fB\-R\fR,
--\fB\-T\fR,
--\fB\-V\fR,
--\fB\-a\fR,
--\fB\-e\fR,
--\fB\-f\fR,
--\fB\-g\fR,
--\fB\-o\fR,
--\fB\-r\fR,
--\fB\-s\fR,
--\fB\-t\fR and
-+Aside from \fB\-c\fP and \fB\-v\fP, options are not portable:
-+.bP
-+Most of @TIC@'s options 
-+are not supported by SVr4 \fBtic\fP:
-+.sp
-+.RS
-+\fB\-0\fR
-+\fB\-1\fR
-+\fB\-C\fR
-+\fB\-G\fR
-+\fB\-I\fR
-+\fB\-N\fR
-+\fB\-R\fR
-+\fB\-T\fR
-+\fB\-V\fR
-+\fB\-a\fR
-+\fB\-e\fR
-+\fB\-f\fR
-+\fB\-g\fR
-+\fB\-o\fR
-+\fB\-r\fR
-+\fB\-s\fR
-+\fB\-t\fR
- \fB\-x\fR
--options
--are not supported under SVr4.
-+.RE
-+.bP
-+The NetBSD \fBtic\fP  supports a few of the ncurses options
-+.sp
-+.RS
-+\fB\-a\fP
-+\fB\-o\fP
-+\fB\-x\fP
-+.RE
-+.IP
-+and adds \fB\-S\fP
-+(a feature which does the same thing
-+as @INFOCMP@'s \fB\-e\fP and \fB\-E\fP options).
-+.PP
- The SVr4 \fB\-c\fR mode does not report bad \*(``use=\*('' links.
- .PP
- System V does not compile entries to or read entries from your
-Index: misc/gen-pkgconfig.in
-Prereq:  1.38 
---- ncurses-6.1-20191005+/misc/gen-pkgconfig.in	2019-10-05 22:25:47.000000000 +0000
-+++ ncurses-6.1-20191012/misc/gen-pkgconfig.in	2019-10-12 22:27:10.000000000 +0000
-@@ -1,5 +1,5 @@
- #!@SHELL@
--# $Id: gen-pkgconfig.in,v 1.38 2019/10/05 22:25:47 tom Exp $
-+# $Id: gen-pkgconfig.in,v 1.40 2019/10/12 22:27:10 tom Exp $
- ##############################################################################
- # Copyright (c) 2009-2018,2019 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -77,13 +77,39 @@
- 	fi
- fi
- 
--LDFLAGS=
--if [ "$libdir" != "/usr/lib" ]; then
--	LDFLAGS="$LDFLAGS -L\${libdir}"
--fi
--if [ "x@EXTRA_LDFLAGS@" != "x" ]; then
--	LDFLAGS="$LDFLAGS @EXTRA_LDFLAGS@"
--fi
-+lib_flags=
-+for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
-+do
-+	case $opt in
-+	-l*) # LIBS is handled specially below
-+		continue
-+		;;
-+	-Wl,-z,*) # ignore flags used to manipulate shared image
-+		continue
-+		;;
-+	-L*)
-+		[ -d ${opt##-L} ] || continue
-+		case ${opt##-L} in
-+		@LD_SEARCHPATH@) # skip standard libdir
-+			continue
-+			;;
-+		*)
-+			found=no
-+			for check in $lib_flags
-+			do
-+				if [ "x$check" = "x$opt" ]
-+				then
-+					found=yes
-+					break
-+				fi
-+			done
-+			[ $found = yes ] && continue
-+			;;
-+		esac
-+		;;
-+	esac
-+	lib_flags="$lib_flags $opt"
-+done
- 
- # Check if we should specify the tinfo library explicitly so that terminfo
- # functions or curses variables (which also reside in tinfo) can be linked
-@@ -150,7 +176,7 @@
- Version: \${version}
- URL: https://invisible-island.net/ncurses
- Requires.private: $reqs
--Libs: $LDFLAGS $LIBS
-+Libs: $lib_flags $LIBS
- Libs.private: @LIBS@ $main_libs
- Cflags: $CFLAGS
- EOF
-Index: misc/ncurses-config.in
-Prereq:  1.40 
---- ncurses-6.1-20191005+/misc/ncurses-config.in	2019-10-05 22:24:20.000000000 +0000
-+++ ncurses-6.1-20191012/misc/ncurses-config.in	2019-10-12 21:25:17.000000000 +0000
-@@ -1,5 +1,5 @@
- #!@SHELL@
--# $Id: ncurses-config.in,v 1.40 2019/10/05 22:24:20 tom Exp $
-+# $Id: ncurses-config.in,v 1.41 2019/10/12 21:25:17 tom Exp $
- ##############################################################################
- # Copyright (c) 2006-2018,2019 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -103,6 +103,9 @@
- for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
- do
- 	case $opt in
-+	-Wl,-z,*) # ignore flags used to manipulate shared image
-+		continue
-+		;;
- 	-L*)
- 		[ -d ${opt##-L} ] || continue
- 		case ${opt##-L} in
-Index: ncurses/tinfo/comp_hash.c
-Prereq:  1.49 
---- ncurses-6.1-20191005+/ncurses/tinfo/comp_hash.c	2019-03-10 00:06:48.000000000 +0000
-+++ ncurses-6.1-20191012/ncurses/tinfo/comp_hash.c	2019-10-12 16:32:13.000000000 +0000
-@@ -44,7 +44,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: comp_hash.c,v 1.49 2019/03/10 00:06:48 tom Exp $")
-+MODULE_ID("$Id: comp_hash.c,v 1.51 2019/10/12 16:32:13 tom Exp $")
- 
- /*
-  * Finds the entry for the given string in the hash table if present.
-@@ -63,7 +63,9 @@
- 
-     hashvalue = data->hash_of(string);
- 
--    if (data->table_data[hashvalue] >= 0) {
-+    if (hashvalue >= 0
-+	&& (unsigned) hashvalue < data->table_size
-+	&& data->table_data[hashvalue] >= 0) {
- 
- 	real_table = _nc_get_table(termcap);
- 	ptr = real_table + data->table_data[hashvalue];
-@@ -96,7 +98,9 @@
-     const HashData *data = _nc_get_hash_info(termcap);
-     int hashvalue = data->hash_of(string);
- 
--    if (data->table_data[hashvalue] >= 0) {
-+    if (hashvalue >= 0
-+	&& (unsigned) hashvalue < data->table_size
-+	&& data->table_data[hashvalue] >= 0) {
- 	const struct name_table_entry *const table = _nc_get_table(termcap);
- 
- 	ptr = table + data->table_data[hashvalue];
-@@ -124,7 +128,9 @@
- 
-     hashvalue = data->hash_of(string);
- 
--    if (data->table_data[hashvalue] >= 0) {
-+    if (hashvalue >= 0
-+	&& (unsigned) hashvalue < data->table_size
-+	&& data->table_data[hashvalue] >= 0) {
- 
- 	real_table = _nc_get_userdefs_table();
- 	ptr = real_table + data->table_data[hashvalue];
-Index: ncurses/tinfo/parse_entry.c
-Prereq:  1.97 
---- ncurses-6.1-20191005+/ncurses/tinfo/parse_entry.c	2019-08-03 23:10:38.000000000 +0000
-+++ ncurses-6.1-20191012/ncurses/tinfo/parse_entry.c	2019-10-12 00:50:31.000000000 +0000
-@@ -47,7 +47,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: parse_entry.c,v 1.97 2019/08/03 23:10:38 tom Exp $")
-+MODULE_ID("$Id: parse_entry.c,v 1.98 2019/10/12 00:50:31 tom Exp $")
- 
- #ifdef LINT
- static short const parametrized[] =
-@@ -654,12 +654,12 @@
- }
- 
- static void
--append_acs0(string_desc * dst, int code, int src)
-+append_acs0(string_desc * dst, int code, char *src, size_t off)
- {
--    if (src != 0) {
-+    if (src != 0 && off < strlen(src)) {
- 	char temp[3];
- 	temp[0] = (char) code;
--	temp[1] = (char) src;
-+	temp[1] = src[off];
- 	temp[2] = 0;
- 	_nc_safe_strcat(dst, temp);
-     }
-@@ -669,7 +669,7 @@
- append_acs(string_desc * dst, int code, char *src)
- {
-     if (VALID_STRING(src) && strlen(src) == 1) {
--	append_acs0(dst, code, *src);
-+	append_acs0(dst, code, src, 0);
-     }
- }
- 
-@@ -1038,17 +1038,17 @@
- 	_nc_str_init(&result, buf2, sizeof(buf2));
- 	_nc_safe_strcat(&result, acs_chars);
- 
--	append_acs0(&result, 'l', box_chars_1[0]);	/* ACS_ULCORNER */
--	append_acs0(&result, 'q', box_chars_1[1]);	/* ACS_HLINE */
--	append_acs0(&result, 'k', box_chars_1[2]);	/* ACS_URCORNER */
--	append_acs0(&result, 'x', box_chars_1[3]);	/* ACS_VLINE */
--	append_acs0(&result, 'j', box_chars_1[4]);	/* ACS_LRCORNER */
--	append_acs0(&result, 'm', box_chars_1[5]);	/* ACS_LLCORNER */
--	append_acs0(&result, 'w', box_chars_1[6]);	/* ACS_TTEE */
--	append_acs0(&result, 'u', box_chars_1[7]);	/* ACS_RTEE */
--	append_acs0(&result, 'v', box_chars_1[8]);	/* ACS_BTEE */
--	append_acs0(&result, 't', box_chars_1[9]);	/* ACS_LTEE */
--	append_acs0(&result, 'n', box_chars_1[10]);	/* ACS_PLUS */
-+	append_acs0(&result, 'l', box_chars_1, 0);	/* ACS_ULCORNER */
-+	append_acs0(&result, 'q', box_chars_1, 1);	/* ACS_HLINE */
-+	append_acs0(&result, 'k', box_chars_1, 2);	/* ACS_URCORNER */
-+	append_acs0(&result, 'x', box_chars_1, 3);	/* ACS_VLINE */
-+	append_acs0(&result, 'j', box_chars_1, 4);	/* ACS_LRCORNER */
-+	append_acs0(&result, 'm', box_chars_1, 5);	/* ACS_LLCORNER */
-+	append_acs0(&result, 'w', box_chars_1, 6);	/* ACS_TTEE */
-+	append_acs0(&result, 'u', box_chars_1, 7);	/* ACS_RTEE */
-+	append_acs0(&result, 'v', box_chars_1, 8);	/* ACS_BTEE */
-+	append_acs0(&result, 't', box_chars_1, 9);	/* ACS_LTEE */
-+	append_acs0(&result, 'n', box_chars_1, 10);	/* ACS_PLUS */
- 
- 	if (buf2[0]) {
- 	    acs_chars = _nc_save_str(buf2);
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20191005+/package/debian-mingw/changelog	2019-10-05 14:44:23.000000000 +0000
-+++ ncurses-6.1-20191012/package/debian-mingw/changelog	2019-10-12 15:30:55.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191005) unstable; urgency=low
-+ncurses6 (6.1+20191012) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 05 Oct 2019 10:44:23 -0400
-+ -- Thomas E. Dickey   Fri, 11 Oct 2019 19:37:45 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20191005+/package/debian-mingw64/changelog	2019-10-05 14:44:23.000000000 +0000
-+++ ncurses-6.1-20191012/package/debian-mingw64/changelog	2019-10-12 15:30:55.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191005) unstable; urgency=low
-+ncurses6 (6.1+20191012) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 05 Oct 2019 10:44:23 -0400
-+ -- Thomas E. Dickey   Fri, 11 Oct 2019 19:37:45 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20191005+/package/debian/changelog	2019-10-05 14:44:23.000000000 +0000
-+++ ncurses-6.1-20191012/package/debian/changelog	2019-10-12 15:30:55.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191005) unstable; urgency=low
-+ncurses6 (6.1+20191012) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 05 Oct 2019 10:44:23 -0400
-+ -- Thomas E. Dickey   Fri, 11 Oct 2019 19:37:45 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.354 
---- ncurses-6.1-20191005+/package/mingw-ncurses.nsi	2019-10-05 14:44:23.000000000 +0000
-+++ ncurses-6.1-20191012/package/mingw-ncurses.nsi	2019-10-12 15:30:55.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.354 2019/10/05 14:44:23 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.355 2019/10/12 15:30:55 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "1005"
-+!define VERSION_MMDD  "1012"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20191005+/package/mingw-ncurses.spec	2019-10-05 14:44:23.000000000 +0000
-+++ ncurses-6.1-20191012/package/mingw-ncurses.spec	2019-10-12 15:30:55.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20191005
-+Release: 20191012
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20191005+/package/ncurses.spec	2019-10-05 14:44:23.000000000 +0000
-+++ ncurses-6.1-20191012/package/ncurses.spec	2019-10-12 15:30:55.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20191005
-+Release: 20191012
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20191005+/package/ncursest.spec	2019-10-05 14:44:23.000000000 +0000
-+++ ncurses-6.1-20191012/package/ncursest.spec	2019-10-12 15:30:55.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20191005
-+Release: 20191012
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/dump_entry.c
-Prereq:  1.173 
---- ncurses-6.1-20191005+/progs/dump_entry.c	2019-05-11 21:02:24.000000000 +0000
-+++ ncurses-6.1-20191012/progs/dump_entry.c	2019-10-12 15:59:07.000000000 +0000
-@@ -39,7 +39,7 @@
- #include "termsort.c"		/* this C file is generated */
- #include 	/* so is this */
- 
--MODULE_ID("$Id: dump_entry.c,v 1.173 2019/05/11 21:02:24 tom Exp $")
-+MODULE_ID("$Id: dump_entry.c,v 1.175 2019/10/12 15:59:07 tom Exp $")
- 
- #define DISCARD(string) string = ABSENT_STRING
- #define PRINTF (void) printf
-@@ -1136,7 +1136,8 @@
- 				*d++ = '\\';
- 				*d = ':';
- 			    } else if (*d == '\\') {
--				*++d = *s++;
-+				if ((*++d = *s++) == '\0')
-+				    break;
- 			    }
- 			    d++;
- 			    *d = '\0';
-@@ -1396,7 +1397,7 @@
- 
-     if (VALID_STRING(mapping)) {
- 	int n = 0;
--	while (mapping[n] != '\0') {
-+	while (mapping[n] != '\0' && mapping[n + 1] != '\0') {
- 	    if (isLine(mapping[n]) &&
- 		mapping[n] != mapping[n + 1]) {
- 		result = FALSE;
diff --git a/ncurses-6.1-20191015.patch b/ncurses-6.1-20191015.patch
deleted file mode 100644
index 31f75ec..0000000
--- a/ncurses-6.1-20191015.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-# ncurses 6.1 - patch 20191015 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191015.patch.gz
-# patch by Thomas E. Dickey 
-# created  Wed Oct 16 00:42:21 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                             |   10 +++++++++-
-# VERSION                          |    2 +-
-# dist.mk                          |    4 ++--
-# ncurses/tinfo/captoinfo.c        |   34 ++++++++++++++++++++--------------
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# package/ncursest.spec            |    2 +-
-# progs/tic.c                      |    5 +++--
-# 12 files changed, 46 insertions(+), 31 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3389 
---- ncurses-6.1-20191012+/NEWS	2019-10-12 21:17:50.000000000 +0000
-+++ ncurses-6.1-20191015/NEWS	2019-10-16 00:04:31.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3389 2019/10/12 21:17:50 tom Exp $
-+-- $Id: NEWS,v 1.3393 2019/10/16 00:04:31 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,14 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191015
-+	+ improve buffer-checks in captoinfo.c, for some cases when the
-+	  input string is shorter than expected.
-+	> fix two errata in tic (report/testcases by Hongxu Chen):
-+	+ check for missing character after backslash in write_it
-+	+ check for missing characters after "%>" when converting from termcap
-+	  syntax (cf: 980530).
-+
- 20191012
- 	+ amend recent changes to ncurses*-config and pc-files to filter out
- 	  Debian linker-flags (report by Sven Joachim, cf: 20150516).
-Index: VERSION
---- ncurses-6.1-20191012+/VERSION	2019-10-12 15:30:55.000000000 +0000
-+++ ncurses-6.1-20191015/VERSION	2019-10-15 21:46:57.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191012
-+5:0:10	6.1	20191015
-Index: dist.mk
-Prereq:  1.1309 
---- ncurses-6.1-20191012+/dist.mk	2019-10-12 15:30:55.000000000 +0000
-+++ ncurses-6.1-20191015/dist.mk	2019-10-15 21:46:57.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1309 2019/10/12 15:30:55 tom Exp $
-+# $Id: dist.mk,v 1.1310 2019/10/15 21:46:57 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191012
-+NCURSES_PATCH = 20191015
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/tinfo/captoinfo.c
-Prereq:  1.96 
---- ncurses-6.1-20191012+/ncurses/tinfo/captoinfo.c	2018-05-12 16:46:55.000000000 +0000
-+++ ncurses-6.1-20191015/ncurses/tinfo/captoinfo.c	2019-10-15 23:13:35.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -97,7 +97,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: captoinfo.c,v 1.96 2018/05/12 16:46:55 tom Exp $")
-+MODULE_ID("$Id: captoinfo.c,v 1.97 2019/10/15 23:13:35 tom Exp $")
- 
- #if 0
- #define DEBUG_THIS(p) DEBUG(9, p)
-@@ -210,7 +210,7 @@
- 	    break;
- 	default:
- 	    c = UChar(*sp);
--	    len = 2;
-+	    len = (c != '\0') ? 2 : 1;
- 	    break;
- 	}
- 	break;
-@@ -224,13 +224,13 @@
- 	break;
-     default:
- 	c = UChar(*sp);
--	len = 1;
-+	len = (c != '\0') ? 1 : 0;
-     }
-     if (isgraph(c) && c != ',' && c != '\'' && c != '\\' && c != ':') {
- 	dp = save_string(dp, "%\'");
- 	dp = save_char(dp, c);
- 	dp = save_char(dp, '\'');
--    } else {
-+    } else if (c != '\0') {
- 	dp = save_string(dp, "%{");
- 	if (c > 99)
- 	    dp = save_char(dp, c / 100 + '0');
-@@ -313,7 +313,7 @@
-     if (s == 0)
- 	s = "";
-     if (parameterized >= 0 && isdigit(UChar(*s)))
--	for (capstart = s;; s++)
-+	for (capstart = s; *s != '\0'; s++)
- 	    if (!(isdigit(UChar(*s)) || *s == '*' || *s == '.'))
- 		break;
- 
-@@ -360,13 +360,18 @@
- 		dp = save_string(dp, "%{2}%*%-");
- 		break;
- 	    case '>':
--		getparm(param, 2);
- 		/* %?%{x}%>%t%{y}%+%; */
--		dp = save_string(dp, "%?");
--		s += cvtchar(s);
--		dp = save_string(dp, "%>%t");
--		s += cvtchar(s);
--		dp = save_string(dp, "%+%;");
-+		if (s[0] && s[1]) {
-+		    getparm(param, 2);
-+		    dp = save_string(dp, "%?");
-+		    s += cvtchar(s);
-+		    dp = save_string(dp, "%>%t");
-+		    s += cvtchar(s);
-+		    dp = save_string(dp, "%+%;");
-+		} else {
-+		    _nc_warning("expected two characters after %%>");
-+		    dp = save_string(dp, "%>");
-+		}
- 		break;
- 	    case 'a':
- 		if ((*s == '=' || *s == '+' || *s == '-'
-@@ -492,7 +497,8 @@
- 	    }
- 	    break;
- 	default:
--	    dp = save_char(dp, *s++);
-+	    if (*s != '\0')
-+		dp = save_char(dp, *s++);
- 	    break;
- 	}
-     }
-@@ -503,7 +509,7 @@
-      */
-     if (capstart) {
- 	dp = save_string(dp, "$<");
--	for (s = capstart;; s++)
-+	for (s = capstart; *s != '\0'; s++)
- 	    if (isdigit(UChar(*s)) || *s == '*' || *s == '.')
- 		dp = save_char(dp, *s);
- 	    else
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20191012+/package/debian-mingw/changelog	2019-10-12 15:30:55.000000000 +0000
-+++ ncurses-6.1-20191015/package/debian-mingw/changelog	2019-10-15 21:46:57.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191012) unstable; urgency=low
-+ncurses6 (6.1+20191015) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Fri, 11 Oct 2019 19:37:45 -0400
-+ -- Thomas E. Dickey   Tue, 15 Oct 2019 17:46:57 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20191012+/package/debian-mingw64/changelog	2019-10-12 15:30:55.000000000 +0000
-+++ ncurses-6.1-20191015/package/debian-mingw64/changelog	2019-10-15 21:46:57.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191012) unstable; urgency=low
-+ncurses6 (6.1+20191015) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Fri, 11 Oct 2019 19:37:45 -0400
-+ -- Thomas E. Dickey   Tue, 15 Oct 2019 17:46:57 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20191012+/package/debian/changelog	2019-10-12 15:30:55.000000000 +0000
-+++ ncurses-6.1-20191015/package/debian/changelog	2019-10-15 21:46:57.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191012) unstable; urgency=low
-+ncurses6 (6.1+20191015) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Fri, 11 Oct 2019 19:37:45 -0400
-+ -- Thomas E. Dickey   Tue, 15 Oct 2019 17:46:57 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.355 
---- ncurses-6.1-20191012+/package/mingw-ncurses.nsi	2019-10-12 15:30:55.000000000 +0000
-+++ ncurses-6.1-20191015/package/mingw-ncurses.nsi	2019-10-15 21:46:57.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.355 2019/10/12 15:30:55 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.356 2019/10/15 21:46:57 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "1012"
-+!define VERSION_MMDD  "1015"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20191012+/package/mingw-ncurses.spec	2019-10-12 15:30:55.000000000 +0000
-+++ ncurses-6.1-20191015/package/mingw-ncurses.spec	2019-10-15 21:46:57.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20191012
-+Release: 20191015
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20191012+/package/ncurses.spec	2019-10-12 15:30:55.000000000 +0000
-+++ ncurses-6.1-20191015/package/ncurses.spec	2019-10-15 21:46:57.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20191012
-+Release: 20191015
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20191012+/package/ncursest.spec	2019-10-12 15:30:55.000000000 +0000
-+++ ncurses-6.1-20191015/package/ncursest.spec	2019-10-15 21:46:57.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20191012
-+Release: 20191015
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/tic.c
-Prereq:  1.278 
---- ncurses-6.1-20191012+/progs/tic.c	2019-07-27 22:44:21.000000000 +0000
-+++ ncurses-6.1-20191015/progs/tic.c	2019-10-15 22:18:29.000000000 +0000
-@@ -48,7 +48,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: tic.c,v 1.278 2019/07/27 22:44:21 tom Exp $")
-+MODULE_ID("$Id: tic.c,v 1.279 2019/10/15 22:18:29 tom Exp $")
- 
- #define STDIN_NAME ""
- 
-@@ -218,7 +218,8 @@
- 	    while ((ch = *t++) != 0) {
- 		*d++ = (char) ch;
- 		if (ch == '\\') {
--		    *d++ = *t++;
-+		    if ((*d++ = *t++) == '\0')
-+			break;
- 		} else if ((ch == '%')
- 			   && (*t == L_BRACE)) {
- 		    char *v = 0;
diff --git a/ncurses-6.1-20191019.patch b/ncurses-6.1-20191019.patch
deleted file mode 100644
index e958b36..0000000
--- a/ncurses-6.1-20191019.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-# ncurses 6.1 - patch 20191019 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191019.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Oct 20 01:10:33 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                             |    9 ++++++++-
-# VERSION                          |    2 +-
-# dist.mk                          |    4 ++--
-# ncurses/tinfo/comp_parse.c       |    6 +++---
-# ncurses/tinfo/make_hash.c        |    7 ++-----
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# package/ncursest.spec            |    2 +-
-# 12 files changed, 27 insertions(+), 23 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3393 
---- ncurses-6.1-20191015+/NEWS	2019-10-16 00:04:31.000000000 +0000
-+++ ncurses-6.1-20191019/NEWS	2019-10-19 21:16:45.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3393 2019/10/16 00:04:31 tom Exp $
-+-- $Id: NEWS,v 1.3396 2019/10/19 21:16:45 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,13 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191019
-+	+ modify make_hash to not require --disable-leaks, to simplify building
-+	  with address-sanitizer.
-+	+ modify tic to exit if it cannot remove a conflicting name, because
-+	  treating that as a partial success can cause an infinite loop in
-+	  use-resolution (report/testcase by Hongxu Chen, cf: 20111001).
-+
- 20191015
- 	+ improve buffer-checks in captoinfo.c, for some cases when the
- 	  input string is shorter than expected.
-Index: VERSION
---- ncurses-6.1-20191015+/VERSION	2019-10-15 21:46:57.000000000 +0000
-+++ ncurses-6.1-20191019/VERSION	2019-10-19 12:47:53.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191015
-+5:0:10	6.1	20191019
-Index: dist.mk
-Prereq:  1.1310 
---- ncurses-6.1-20191015+/dist.mk	2019-10-15 21:46:57.000000000 +0000
-+++ ncurses-6.1-20191019/dist.mk	2019-10-19 12:47:53.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1310 2019/10/15 21:46:57 tom Exp $
-+# $Id: dist.mk,v 1.1311 2019/10/19 12:47:53 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191015
-+NCURSES_PATCH = 20191019
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/tinfo/comp_parse.c
-Prereq:  1.106 
---- ncurses-6.1-20191015+/ncurses/tinfo/comp_parse.c	2018-05-26 14:16:46.000000000 +0000
-+++ ncurses-6.1-20191019/ncurses/tinfo/comp_parse.c	2019-10-19 20:47:43.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -47,7 +47,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: comp_parse.c,v 1.106 2018/05/26 14:16:46 tom Exp $")
-+MODULE_ID("$Id: comp_parse.c,v 1.107 2019/10/19 20:47:43 tom Exp $")
- 
- static void sanity_check2(TERMTYPE2 *, bool);
- NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
-@@ -180,11 +180,11 @@
- 			++qend;
- 		    while ((*qstart++ = *qend++) != '\0') ;
- 		    fprintf(stderr, "...now\t%s\n", p2);
-+		    removed = TRUE;
- 		} else {
- 		    fprintf(stderr, "Cannot remove alias '%.*s'\n",
- 			    (int) (qend - qstart), qstart);
- 		}
--		removed = TRUE;
- 		break;
- 	    }
- 	}
-Index: ncurses/tinfo/make_hash.c
-Prereq:  1.28 
---- ncurses-6.1-20191015+/ncurses/tinfo/make_hash.c	2019-07-27 23:06:54.000000000 +0000
-+++ ncurses-6.1-20191019/ncurses/tinfo/make_hash.c	2019-10-19 21:02:19.000000000 +0000
-@@ -43,7 +43,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: make_hash.c,v 1.28 2019/07/27 23:06:54 tom Exp $")
-+MODULE_ID("$Id: make_hash.c,v 1.29 2019/10/19 21:02:19 tom Exp $")
- 
- /*
-  *	_nc_make_hash_table()
-@@ -164,13 +164,11 @@
- 
-     int col = 0;
- 
--#if NO_LEAKS
-     if (buffer == 0) {
- 	free(list);
- 	list = 0;
- 	return 0;
-     }
--#endif
- 
-     if (*buffer != '#') {
- 	if (list == 0) {
-@@ -433,12 +431,11 @@
-     }
- 
-     free(hash_table);
--#if NO_LEAKS
-     for (n = 0; (n < tablesize); ++n) {
- 	free((void *) name_table[n].ute_name);
-     }
-     free(name_table);
-     parse_columns(0);
--#endif
-+
-     return EXIT_SUCCESS;
- }
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20191015+/package/debian-mingw/changelog	2019-10-15 21:46:57.000000000 +0000
-+++ ncurses-6.1-20191019/package/debian-mingw/changelog	2019-10-19 12:47:53.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191015) unstable; urgency=low
-+ncurses6 (6.1+20191019) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Tue, 15 Oct 2019 17:46:57 -0400
-+ -- Thomas E. Dickey   Sat, 19 Oct 2019 08:47:53 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20191015+/package/debian-mingw64/changelog	2019-10-15 21:46:57.000000000 +0000
-+++ ncurses-6.1-20191019/package/debian-mingw64/changelog	2019-10-19 12:47:53.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191015) unstable; urgency=low
-+ncurses6 (6.1+20191019) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Tue, 15 Oct 2019 17:46:57 -0400
-+ -- Thomas E. Dickey   Sat, 19 Oct 2019 08:47:53 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20191015+/package/debian/changelog	2019-10-15 21:46:57.000000000 +0000
-+++ ncurses-6.1-20191019/package/debian/changelog	2019-10-19 12:47:53.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191015) unstable; urgency=low
-+ncurses6 (6.1+20191019) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Tue, 15 Oct 2019 17:46:57 -0400
-+ -- Thomas E. Dickey   Sat, 19 Oct 2019 08:47:53 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.356 
---- ncurses-6.1-20191015+/package/mingw-ncurses.nsi	2019-10-15 21:46:57.000000000 +0000
-+++ ncurses-6.1-20191019/package/mingw-ncurses.nsi	2019-10-19 12:47:53.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.356 2019/10/15 21:46:57 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.357 2019/10/19 12:47:53 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "1015"
-+!define VERSION_MMDD  "1019"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20191015+/package/mingw-ncurses.spec	2019-10-15 21:46:57.000000000 +0000
-+++ ncurses-6.1-20191019/package/mingw-ncurses.spec	2019-10-19 12:47:53.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20191015
-+Release: 20191019
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20191015+/package/ncurses.spec	2019-10-15 21:46:57.000000000 +0000
-+++ ncurses-6.1-20191019/package/ncurses.spec	2019-10-19 12:47:53.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20191015
-+Release: 20191019
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20191015+/package/ncursest.spec	2019-10-15 21:46:57.000000000 +0000
-+++ ncurses-6.1-20191019/package/ncursest.spec	2019-10-19 12:47:53.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20191015
-+Release: 20191019
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20191026.patch b/ncurses-6.1-20191026.patch
deleted file mode 100644
index d23c81c..0000000
--- a/ncurses-6.1-20191026.patch
+++ /dev/null
@@ -1,740 +0,0 @@
-# ncurses 6.1 - patch 20191026 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191026.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Oct 27 01:34:14 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                                  |   10 ++-
-# VERSION                               |    2 
-# dist.mk                               |    4 -
-# doc/html/man/adacurses6-config.1.html |    2 
-# doc/html/man/captoinfo.1m.html        |    2 
-# doc/html/man/clear.1.html             |    2 
-# doc/html/man/curs_add_wch.3x.html     |  103 +++++++++++++++++---------------
-# doc/html/man/form.3x.html             |    2 
-# doc/html/man/infocmp.1m.html          |    2 
-# doc/html/man/infotocap.1m.html        |    2 
-# doc/html/man/menu.3x.html             |    2 
-# doc/html/man/ncurses.3x.html          |    2 
-# doc/html/man/ncurses6-config.1.html   |    2 
-# doc/html/man/panel.3x.html            |    2 
-# doc/html/man/tabs.1.html              |    2 
-# doc/html/man/terminfo.5.html          |    2 
-# doc/html/man/tic.1m.html              |    2 
-# doc/html/man/toe.1m.html              |    2 
-# doc/html/man/tput.1.html              |    2 
-# doc/html/man/tset.1.html              |    2 
-# man/curs_add_wch.3x                   |   56 ++++++++++-------
-# misc/terminfo.src                     |   16 ++++
-# ncurses/tinfo/lib_tgoto.c             |   13 +++-
-# package/debian-mingw/changelog        |    4 -
-# package/debian-mingw64/changelog      |    4 -
-# package/debian/changelog              |    4 -
-# package/mingw-ncurses.nsi             |    4 -
-# package/mingw-ncurses.spec            |    2 
-# package/ncurses.spec                  |    2 
-# package/ncursest.spec                 |    2 
-# 30 files changed, 152 insertions(+), 106 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3396 
---- ncurses-6.1-20191019+/NEWS	2019-10-19 21:16:45.000000000 +0000
-+++ ncurses-6.1-20191026/NEWS	2019-10-27 00:10:51.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3396 2019/10/19 21:16:45 tom Exp $
-+-- $Id: NEWS,v 1.3399 2019/10/27 00:10:51 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,14 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191026
-+	+ add a note in man/curs_add_wch.3x about Unicode terminology for the
-+	  line-drawing characters (report by Nick Black).
-+	+ improve comment in lib_tgoto.c regarding the use of \200 where a
-+	  \0 would be intended by the caller (report by "64 bit", cf: 20000923).
-+	+ modify linux-16color to accommodate Linux console driver change in
-+	  early 2018 (report by Dino Petrucci).
-+
- 20191019
- 	+ modify make_hash to not require --disable-leaks, to simplify building
- 	  with address-sanitizer.
-Index: VERSION
---- ncurses-6.1-20191019+/VERSION	2019-10-19 12:47:53.000000000 +0000
-+++ ncurses-6.1-20191026/VERSION	2019-10-26 08:56:47.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191019
-+5:0:10	6.1	20191026
-Index: dist.mk
-Prereq:  1.1311 
---- ncurses-6.1-20191019+/dist.mk	2019-10-19 12:47:53.000000000 +0000
-+++ ncurses-6.1-20191026/dist.mk	2019-10-26 08:56:47.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1311 2019/10/19 12:47:53 tom Exp $
-+# $Id: dist.mk,v 1.1312 2019/10/26 08:56:47 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191019
-+NCURSES_PATCH = 20191026
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/adacurses6-config.1.html
---- ncurses-6.1-20191019+/doc/html/man/adacurses6-config.1.html	2019-10-12 21:32:36.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/adacurses6-config.1.html	2019-10-27 00:15:46.000000000 +0000
-@@ -125,7 +125,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20191019+/doc/html/man/captoinfo.1m.html	2019-10-12 21:32:36.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/captoinfo.1m.html	2019-10-27 00:15:46.000000000 +0000
-@@ -198,7 +198,7 @@
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/clear.1.html
---- ncurses-6.1-20191019+/doc/html/man/clear.1.html	2019-10-12 21:32:36.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/clear.1.html	2019-10-27 00:15:46.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
- 
-Index: doc/html/man/curs_add_wch.3x.html
---- ncurses-6.1-20191019+/doc/html/man/curs_add_wch.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/curs_add_wch.3x.html	2019-10-27 00:15:46.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -138,7 +138,24 @@
-        WACS_VLINE        0x2502     |         x       vertical line
- 
-        The wide-character configuration of ncurses also  defines  symbols  for
--       double-lines:
-+       thick lines (acsc "J" to "V"):
-+
-+       ACS               Unicode   ASCII     acsc    Glyph
-+       Name              Default   Default   char    Name
-+       -----------------------------------------------------------------------
-+       WACS_T_BTEE       0x253b    +         V       thick tee pointing up
-+       WACS_T_HLINE      0x2501    -         Q       thick horizontal line
-+       WACS_T_LLCORNER   0x2517    +         M       thick lower left corner
-+       WACS_T_LRCORNER   0x251b    +         J       thick lower right corner
-+       WACS_T_LTEE       0x252b    +         T       thick tee pointing right
-+       WACS_T_PLUS       0x254b    +         N       thick large plus
-+       WACS_T_RTEE       0x2523    +         U       thick tee pointing left
-+       WACS_T_TTEE       0x2533    +         W       thick tee pointing down
-+       WACS_T_ULCORNER   0x250f    +         L       thick upper left corner
-+       WACS_T_URCORNER   0x2513    +         K       thick upper right corner
-+       WACS_T_VLINE      0x2503    |         X       thick vertical line
-+
-+       and for double-lines (acsc "A" to "I"):
- 
-        ACS               Unicode   ASCII     acsc    Glyph
-        Name              Default   Default   char    Name
-@@ -155,28 +172,22 @@
-        WACS_D_URCORNER   0x2557    +         B       double upper right corner
-        WACS_D_VLINE      0x2551    |         Y       double vertical line
- 
--       and for thick lines:
-+       Unicode's  descriptions  for  these  characters  differs  slightly from
-+       ncurses, by introducing the term "light"  (along  with  less  important
-+       details).   Here are its descriptions for the normal, thick, and double
-+       horizontal lines:
- 
--       ACS               Unicode   ASCII     acsc    Glyph
--       Name              Default   Default   char    Name
--       -----------------------------------------------------------------------
--       WACS_T_BTEE       0x253b    +         V       thick tee pointing up
--       WACS_T_HLINE      0x2501    -         Q       thick horizontal line
--       WACS_T_LLCORNER   0x2517    +         M       thick lower left corner
--       WACS_T_LRCORNER   0x251b    +         J       thick lower right corner
--       WACS_T_LTEE       0x252b    +         T       thick tee pointing right
--       WACS_T_PLUS       0x254b    +         N       thick large plus
--       WACS_T_RTEE       0x2523    +         U       thick tee pointing left
--       WACS_T_TTEE       0x2533    +         W       thick tee pointing down
--       WACS_T_ULCORNER   0x250f    +         L       thick upper left corner
--       WACS_T_URCORNER   0x2513    +         K       thick upper right corner
--       WACS_T_VLINE      0x2503    |         X       thick vertical line
-+       o   U+2500 BOX DRAWINGS LIGHT HORIZONTAL
-+
-+       o   U+2501 BOX DRAWINGS HEAVY HORIZONTAL
-+
-+       o   U+2550 BOX DRAWINGS DOUBLE HORIZONTAL
- 
- 
-

    RETURN VALUE

    -        All routines return the integer ERR upon failure and OK on success.
- 
--       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-        wmove, and return an error if the position is outside the window, or if
-        the window pointer is null.
- 
-@@ -186,71 +197,71 @@
- 
- 
-

    PORTABILITY

    --       All  of these functions are described in the XSI Curses standard, Issue
--       4.  The defaults specified for line-drawing  characters  apply  in  the
-+       All of these functions are described in the XSI Curses standard,  Issue
-+       4.   The  defaults  specified  for line-drawing characters apply in the
-        POSIX locale.
- 
--       X/Open  Curses  makes it clear that the WACS_ symbols should be defined
-+       X/Open Curses makes it clear that the WACS_ symbols should  be  defined
-        as a pointer to cchar_t data, e.g., in the discussion of border_set.  A
-        few implementations are problematic:
- 
-        o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
- 
-        o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
--           symbols as if the ACS_ symbols were wide  characters.   The  misde-
--           fined  symbols  are the arrows and other symbols which are not used
-+           symbols  as  if  the ACS_ symbols were wide characters.  The misde-
-+           fined symbols are the arrows and other symbols which are  not  used
-            for line-drawing.
- 
-        X/Open Curses does not define symbols for thick- or double-lines.  SVr4
--       curses  implementations  defined their line-drawing symbols in terms of
--       intermediate symbols.  This implementation extends those symbols,  pro-
-+       curses implementations defined their line-drawing symbols in  terms  of
-+       intermediate  symbols.  This implementation extends those symbols, pro-
-        viding new definitions which are not in the SVr4 implementations.
- 
--       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
-+       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
-        alternate character sets (i.e., the acsc capability), with their corre-
--       sponding  line-drawing  characters.   X/Open Curses did not address the
--       aspect of integrating Unicode with line-drawing  characters.   Existing
--       implementations  of  Unix curses (AIX, HPUX, Solaris) use only the acsc
--       character-mapping to provide this feature.  As a result,  those  imple-
--       mentations  can  only use single-byte line-drawing characters.  Ncurses
--       5.3 (2002) provided a table of Unicode values to solve these  problems.
-+       sponding line-drawing characters.  X/Open Curses did  not  address  the
-+       aspect  of  integrating Unicode with line-drawing characters.  Existing
-+       implementations of Unix curses (AIX, HPUX, Solaris) use only  the  acsc
-+       character-mapping  to  provide this feature.  As a result, those imple-
-+       mentations can only use single-byte line-drawing  characters.   Ncurses
-+       5.3  (2002) provided a table of Unicode values to solve these problems.
-        NetBSD curses incorporated that table in 2010.
- 
-        In this implementation, the Unicode values are used instead of the ter-
--       minal description's acsc mapping as discussed in  ncurses(3x)  for  the
--       environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the same
-+       minal  description's  acsc  mapping as discussed in ncurses(3x) for the
-+       environment variable NCURSES_NO_UTF8_ACS.  In contrast,  for  the  same
-        cases, the line-drawing characters described in curs_addch(3x) will use
-        only the ASCII default values.
- 
--       Having  Unicode available does not solve all of the problems with line-
-+       Having Unicode available does not solve all of the problems with  line-
-        drawing for curses:
- 
--       o   The closest Unicode equivalents to the VT100 graphics  S1,  S3,  S7
--           and  S9 frequently are not displayed at the regular intervals which
-+       o   The  closest  Unicode  equivalents to the VT100 graphics S1, S3, S7
-+           and S9 frequently are not displayed at the regular intervals  which
-            the terminal used.
- 
--       o   The lantern is a special case.  It originated with  the  AT&T  4410
--           terminal  in the early 1980s.  There is no accessible documentation
-+       o   The  lantern  is  a special case.  It originated with the AT&T 4410
-+           terminal in the early 1980s.  There is no accessible  documentation
-            depicting the lantern symbol on the AT&T terminal.
- 
-            Lacking documentation, most readers assume that a storm lantern was
-            intended.  But there are several possibilities, all with problems.
- 
--           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
--           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
--           since  they  lie  outside the BMP and as a result are not generally
-+           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
-+           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
-+           since they lie outside the BMP and as a result  are  not  generally
-            available in terminals.  They are not storm lanterns, in any case.
- 
-            Most storm lanterns have a tapering glass chimney (to guard against
-            tipping); some have a wire grid protecting the chimney.
- 
--           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
-+           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
-            terminal, no one can tell what the image represents.  Unicode calls
-            it a snowman.
- 
--           Others  have suggested these alternatives: S U+00A7 (section mark),
-+           Others have suggested these alternatives: S U+00A7 (section  mark),
-            O U+0398 (theta), O U+03A6 (phi), d U+03B4 (delta),  U+2327 (x in a
--           rectangle),   U+256C  (forms  double  vertical and horizontal), and
-+           rectangle),  U+256C (forms double  vertical  and  horizontal),  and
-            U+2612 (ballot box with x).
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.1-20191019+/doc/html/man/form.3x.html	2019-10-12 21:32:38.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/form.3x.html	2019-10-27 00:15:49.000000000 +0000
-@@ -246,7 +246,7 @@
-        curses(3x)  and  related  pages  whose names begin "form_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.1-20191019+/doc/html/man/infocmp.1m.html	2019-10-12 21:32:39.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/infocmp.1m.html	2019-10-27 00:15:50.000000000 +0000
-@@ -512,7 +512,7 @@
- 
-        https://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/infotocap.1m.html
---- ncurses-6.1-20191019+/doc/html/man/infotocap.1m.html	2019-10-12 21:32:39.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/infotocap.1m.html	2019-10-27 00:15:50.000000000 +0000
-@@ -90,7 +90,7 @@
-

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/menu.3x.html
---- ncurses-6.1-20191019+/doc/html/man/menu.3x.html	2019-10-12 21:32:39.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/menu.3x.html	2019-10-27 00:15:50.000000000 +0000
-@@ -221,7 +221,7 @@
-        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.1-20191019+/doc/html/man/ncurses.3x.html	2019-10-12 21:32:40.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/ncurses.3x.html	2019-10-27 00:15:51.000000000 +0000
-@@ -59,7 +59,7 @@
-        method of updating  character  screens  with  reasonable  optimization.
-        This  implementation  is  "new  curses"  (ncurses)  and is the approved
-        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
-        The  ncurses  library emulates the curses library of System V Release 4
-        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-Index: doc/html/man/ncurses6-config.1.html
---- ncurses-6.1-20191019+/doc/html/man/ncurses6-config.1.html	2019-10-12 21:32:40.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/ncurses6-config.1.html	2019-10-27 00:15:51.000000000 +0000
-@@ -112,7 +112,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.1-20191019+/doc/html/man/panel.3x.html	2019-10-12 21:32:40.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/panel.3x.html	2019-10-27 00:15:51.000000000 +0000
-@@ -204,7 +204,7 @@
-

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/tabs.1.html
---- ncurses-6.1-20191019+/doc/html/man/tabs.1.html	2019-10-12 21:32:40.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/tabs.1.html	2019-10-27 00:15:51.000000000 +0000
-@@ -205,7 +205,7 @@
-

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.1-20191019+/doc/html/man/terminfo.5.html	2019-10-12 21:32:41.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/terminfo.5.html	2019-10-27 00:15:51.000000000 +0000
-@@ -103,7 +103,7 @@
-        have, by specifying how to perform screen operations, and by specifying
-        padding requirements and initialization sequences.
- 
--       This manual describes ncurses version 6.1 (patch 20191012).
-+       This manual describes ncurses version 6.1 (patch 20191026).
- 
- 
-

    Terminfo Entry Syntax

    -Index: doc/html/man/tic.1m.html
---- ncurses-6.1-20191019+/doc/html/man/tic.1m.html	2019-10-12 21:32:41.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/tic.1m.html	2019-10-27 00:15:51.000000000 +0000
-@@ -460,7 +460,7 @@
-        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-        term(5).  terminfo(5).  user_caps(5).
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/toe.1m.html
---- ncurses-6.1-20191019+/doc/html/man/toe.1m.html	2019-10-12 21:32:41.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/toe.1m.html	2019-10-27 00:15:51.000000000 +0000
-@@ -170,7 +170,7 @@
-        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
-        minfo(5).
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.1-20191019+/doc/html/man/tput.1.html	2019-10-12 21:32:41.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/tput.1.html	2019-10-27 00:15:51.000000000 +0000
-@@ -522,7 +522,7 @@
-

    SEE ALSO

    -        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.1-20191019+/doc/html/man/tset.1.html	2019-10-12 21:32:41.000000000 +0000
-+++ ncurses-6.1-20191026/doc/html/man/tset.1.html	2019-10-27 00:15:51.000000000 +0000
-@@ -389,7 +389,7 @@
-        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
-        ttys(5), environ(7)
- 
--       This describes ncurses version 6.1 (patch 20191012).
-+       This describes ncurses version 6.1 (patch 20191026).
- 
- 
- 
-Index: man/curs_add_wch.3x
-Prereq:  1.24 
---- ncurses-6.1-20191019+/man/curs_add_wch.3x	2017-11-18 23:47:37.000000000 +0000
-+++ ncurses-6.1-20191026/man/curs_add_wch.3x	2019-10-27 00:07:13.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2001-2015,2017 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2001-2017,2019 Free 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_add_wch.3x,v 1.24 2017/11/18 23:47:37 tom Exp $
-+.\" $Id: curs_add_wch.3x,v 1.25 2019/10/27 00:07:13 tom Exp $
- .TH curs_add_wch 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -155,7 +155,28 @@
- .TE
- .PP
- The wide-character configuration of ncurses also defines symbols
--for double-lines:
-+for thick lines (\fBacsc\fP \*(``J\*('' to \*(``V\*(''):
-+.TS
-+l l l l l
-+l l l l l
-+_ _ _ _ _
-+lw(1.5i) lw5 lw5 lw5 lw20.
-+\fBACS\fR	\fBUnicode\fP	\fBASCII\fR	\fBacsc\fP	\fBGlyph\fR
-+\fBName\fR	\fBDefault\fP	\fBDefault\fR	\fBchar\fP	\fBName\fR
-+WACS_T_BTEE	0x253b	+	V	thick tee pointing up
-+WACS_T_HLINE	0x2501	-	Q	thick horizontal line
-+WACS_T_LLCORNER	0x2517	+	M	thick lower left corner
-+WACS_T_LRCORNER	0x251b	+	J	thick lower right corner
-+WACS_T_LTEE	0x252b	+	T	thick tee pointing right
-+WACS_T_PLUS	0x254b	+	N	thick large plus
-+WACS_T_RTEE	0x2523	+	U	thick tee pointing left
-+WACS_T_TTEE	0x2533	+	W	thick tee pointing down
-+WACS_T_ULCORNER	0x250f	+	L	thick upper left corner
-+WACS_T_URCORNER	0x2513	+	K	thick upper right corner
-+WACS_T_VLINE	0x2503	|	X	thick vertical line
-+.TE
-+.PP
-+and for double-lines (\fBacsc\fP \*(``A\*('' to \*(``I\*(''):
- .PP
- .TS
- l l l l l
-@@ -177,26 +198,15 @@
- WACS_D_VLINE	0x2551	|	Y	double vertical line
- .TE
- .PP
--and for thick lines:
--.TS
--l l l l l
--l l l l l
--_ _ _ _ _
--lw(1.5i) lw5 lw5 lw5 lw20.
--\fBACS\fR	\fBUnicode\fP	\fBASCII\fR	\fBacsc\fP	\fBGlyph\fR
--\fBName\fR	\fBDefault\fP	\fBDefault\fR	\fBchar\fP	\fBName\fR
--WACS_T_BTEE	0x253b	+	V	thick tee pointing up
--WACS_T_HLINE	0x2501	-	Q	thick horizontal line
--WACS_T_LLCORNER	0x2517	+	M	thick lower left corner
--WACS_T_LRCORNER	0x251b	+	J	thick lower right corner
--WACS_T_LTEE	0x252b	+	T	thick tee pointing right
--WACS_T_PLUS	0x254b	+	N	thick large plus
--WACS_T_RTEE	0x2523	+	U	thick tee pointing left
--WACS_T_TTEE	0x2533	+	W	thick tee pointing down
--WACS_T_ULCORNER	0x250f	+	L	thick upper left corner
--WACS_T_URCORNER	0x2513	+	K	thick upper right corner
--WACS_T_VLINE	0x2503	|	X	thick vertical line
--.TE
-+Unicode's descriptions for these characters differs slightly from ncurses,
-+by introducing the term \*(``light\*('' (along with less important details).
-+Here are its descriptions for the normal, thick, and double horizontal lines:
-+.bP
-+U+2500 BOX DRAWINGS LIGHT HORIZONTAL
-+.bP
-+U+2501 BOX DRAWINGS HEAVY HORIZONTAL
-+.bP
-+U+2550 BOX DRAWINGS DOUBLE HORIZONTAL
- .SH RETURN VALUE
- .PP
- All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success.
-Index: misc/terminfo.src
---- ncurses-6.1-20191019+/misc/terminfo.src	2019-09-22 18:48:45.000000000 +0000
-+++ ncurses-6.1-20191026/misc/terminfo.src	2019-10-26 17:00:56.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.765 $
--#	$Date: 2019/09/22 18:48:45 $
-+#	$Revision: 1.766 $
-+#	$Date: 2019/10/26 17:00:56 $
- #
- # 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
-@@ -1126,10 +1126,16 @@
- # console font but bright background colors turn into dim ones when
- # you use a 512-character console font. This uses bold for bright
- # foreground colors and blink for bright background colors.
-+#
-+# Interestingly, the original version of this entry in 2009 used a documented
-+# (but nonstandard) SGR 21, which was supported in the Linux console since 1992
-+# as an equivalent for SGR 22.  Long after (early 2018), someone modified the
-+# console driver to make it ignore SGR 21 because the ECMA-48 standard
-+# suggested a different use for that particular code.
- linux-16color|linux console with 16 colors,
- 	colors#16, ncv#42, pairs#0x100,
- 	setab=\E[4%p1%{8}%m%d%?%p1%{7}%>%t;5%e;25%;m,
--	setaf=\E[3%p1%{8}%m%d%?%p1%{7}%>%t;1%e;21%;m,
-+	setaf=\E[3%p1%{8}%m%d%?%p1%{7}%>%t;1%e;22%;m,
- 	use=linux,
- 
- # bterm (bogl 0.1.18)
-@@ -26375,4 +26381,8 @@
- # 2019-09-22
- #	+ correct a comment -TD
- #
-+# 2019-10-26
-+#	+ modify linux-16color to accommodate Linux console driver change in
-+#	  early 2018 (report by Dino Petrucci).
-+#
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: ncurses/tinfo/lib_tgoto.c
-Prereq:  1.17 
---- ncurses-6.1-20191019+/ncurses/tinfo/lib_tgoto.c	2018-04-07 21:11:48.000000000 +0000
-+++ ncurses-6.1-20191026/ncurses/tinfo/lib_tgoto.c	2019-10-26 22:43:48.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2000-2012,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2000-2018,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -35,7 +35,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: lib_tgoto.c,v 1.17 2018/04/07 21:11:48 tom Exp $")
-+MODULE_ID("$Id: lib_tgoto.c,v 1.18 2019/10/26 22:43:48 tom Exp $")
- 
- #if !PURE_TERMINFO
- static bool
-@@ -125,7 +125,14 @@
- 			*value += 1;
- 			need_BC = TRUE;
- 		    } else {
--			*value = 0200;	/* tputs will treat this as \0 */
-+			/* tputs will pretend this is \0, which will almost
-+			 * always work since ANSI-compatible terminals ignore
-+			 * the character.  ECMA-48 does not document a C1
-+			 * control for this value.  A few (obsolete) terminals
-+			 * can use this value in special cases, such as cursor
-+			 * addressing using single-byte coordinates.
-+			 */
-+			*value = 0200;
- 		    }
- 		}
- 		result[used++] = (char) *value++;
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20191019+/package/debian-mingw/changelog	2019-10-19 12:47:53.000000000 +0000
-+++ ncurses-6.1-20191026/package/debian-mingw/changelog	2019-10-26 08:56:47.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191019) unstable; urgency=low
-+ncurses6 (6.1+20191026) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 19 Oct 2019 08:47:53 -0400
-+ -- Thomas E. Dickey   Sat, 26 Oct 2019 04:56:47 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20191019+/package/debian-mingw64/changelog	2019-10-19 12:47:53.000000000 +0000
-+++ ncurses-6.1-20191026/package/debian-mingw64/changelog	2019-10-26 08:56:47.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191019) unstable; urgency=low
-+ncurses6 (6.1+20191026) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 19 Oct 2019 08:47:53 -0400
-+ -- Thomas E. Dickey   Sat, 26 Oct 2019 04:56:47 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20191019+/package/debian/changelog	2019-10-19 12:47:53.000000000 +0000
-+++ ncurses-6.1-20191026/package/debian/changelog	2019-10-26 08:56:47.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191019) unstable; urgency=low
-+ncurses6 (6.1+20191026) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 19 Oct 2019 08:47:53 -0400
-+ -- Thomas E. Dickey   Sat, 26 Oct 2019 04:56:47 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.357 
---- ncurses-6.1-20191019+/package/mingw-ncurses.nsi	2019-10-19 12:47:53.000000000 +0000
-+++ ncurses-6.1-20191026/package/mingw-ncurses.nsi	2019-10-26 08:56:47.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.357 2019/10/19 12:47:53 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.358 2019/10/26 08:56:47 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "1019"
-+!define VERSION_MMDD  "1026"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20191019+/package/mingw-ncurses.spec	2019-10-19 12:47:53.000000000 +0000
-+++ ncurses-6.1-20191026/package/mingw-ncurses.spec	2019-10-26 08:56:47.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20191019
-+Release: 20191026
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20191019+/package/ncurses.spec	2019-10-19 12:47:53.000000000 +0000
-+++ ncurses-6.1-20191026/package/ncurses.spec	2019-10-26 08:56:47.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20191019
-+Release: 20191026
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20191019+/package/ncursest.spec	2019-10-19 12:47:53.000000000 +0000
-+++ ncurses-6.1-20191026/package/ncursest.spec	2019-10-26 08:56:47.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20191019
-+Release: 20191026
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20191102.patch b/ncurses-6.1-20191102.patch
deleted file mode 100644
index 2c94399..0000000
--- a/ncurses-6.1-20191102.patch
+++ /dev/null
@@ -1,3052 +0,0 @@
-# ncurses 6.1 - patch 20191102 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191102.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Nov  3 01:16:28 UTC 2019
-# ------------------------------------------------------------------------------
-# Ada95/aclocal.m4                 |   22 -
-# Ada95/configure                  |  288 +++++++-------
-# NEWS                             |    9 
-# VERSION                          |    2 
-# aclocal.m4                       |   20 
-# configure                        |  558 +++++++++++++--------------
-# dist.mk                          |    4 
-# misc/terminfo.src                |   16 
-# ncurses/base/lib_getch.c         |   32 -
-# ncurses/tinfo/lib_setup.c        |   20 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# package/ncursest.spec            |    2 
-# test/aclocal.m4                  |   22 -
-# test/configure                   |  756 ++++++++++++++++++-------------------
-# 19 files changed, 901 insertions(+), 870 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.146 
---- ncurses-6.1-20191026+/Ada95/aclocal.m4	2019-09-21 22:12:40.000000000 +0000
-+++ ncurses-6.1-20191102/Ada95/aclocal.m4	2019-11-02 20:56:52.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: aclocal.m4,v 1.146 2019/09/21 22:12:40 tom Exp $
-+dnl $Id: aclocal.m4,v 1.147 2019/11/02 20:56:52 tom Exp $
- dnl Macros used in NCURSES Ada95 auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -288,7 +288,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27
-+dnl CF_ADD_LIBS version: 3 updated: 2019/11/02 16:47:33
- dnl -----------
- dnl Add one or more libraries, used to enforce consistency.  Libraries are
- dnl prepended to an existing list, since their dependencies are assumed to
-@@ -297,19 +297,19 @@
- dnl $1 = libraries to add, with the "-l", etc.
- dnl $2 = variable to update (default $LIBS)
- AC_DEFUN([CF_ADD_LIBS],[
--cf_add_libs="$1"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in [$]ifelse($2,,LIBS,[$2])
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="[$]ifelse($2,,LIBS,[$2])"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $1; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- ifelse($2,,LIBS,[$2])="$cf_add_libs"
- ])dnl
-Index: Ada95/configure
---- ncurses-6.1-20191026+/Ada95/configure	2019-09-21 22:12:48.000000000 +0000
-+++ ncurses-6.1-20191102/Ada95/configure	2019-11-02 20:57:14.000000000 +0000
-@@ -4252,19 +4252,19 @@
- 
- fi
- 
--cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -4629,19 +4629,19 @@
- 
- fi
- 
--cf_add_libs="`$NCURSES_CONFIG --libs`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -5647,38 +5647,38 @@
- 	;;
- esac
- 
--cf_add_libs="$cf_ncurses_LIBS"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
- then
- 
--cf_add_libs="-l$cf_nculib_root"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -6516,19 +6516,19 @@
- 	done
- fi
- 
--cf_add_libs="$cf_cv_library_file_utf8"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_cv_library_file_utf8; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -6649,19 +6649,19 @@
- 
- fi
- 
--cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -7026,19 +7026,19 @@
- 
- fi
- 
--cf_add_libs="`$NCURSES_CONFIG --libs`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -8052,38 +8052,38 @@
- 	;;
- esac
- 
--cf_add_libs="$cf_ncurses_LIBS"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
- then
- 
--cf_add_libs="-l$cf_nculib_root"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -8486,19 +8486,19 @@
- 
- fi
- 
--cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -8863,19 +8863,19 @@
- 
- fi
- 
--cf_add_libs="`$NCURSES_CONFIG --libs`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -9881,38 +9881,38 @@
- 	;;
- esac
- 
--cf_add_libs="$cf_ncurses_LIBS"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
- then
- 
--cf_add_libs="-l$cf_nculib_root"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -10356,19 +10356,19 @@
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 		cf_save_LIBS="$LIBS"
- 
--cf_add_libs="${LD_RPATH_OPT}$libdir"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in ${LD_RPATH_OPT}$libdir; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -13453,19 +13453,19 @@
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
--cf_add_libs="-l$cf_lib_pthread"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_lib_pthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -13513,19 +13513,19 @@
- 
- 	if test "$with_pthread" = yes ; then
- 
--cf_add_libs="-l$cf_lib_pthread"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_lib_pthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-Index: NEWS
-Prereq:  1.3399 
---- ncurses-6.1-20191026+/NEWS	2019-10-27 00:10:51.000000000 +0000
-+++ ncurses-6.1-20191102/NEWS	2019-11-03 00:12:08.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3399 2019/10/27 00:10:51 tom Exp $
-+-- $Id: NEWS,v 1.3401 2019/11/03 00:12:08 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,13 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191102
-+	+ check parameter of set_escdelay, return ERR if negative.
-+	+ check parameter of set_tabsize, return ERR if not greater than zero
-+	  (report/patch by Anthony Sottile).
-+	+ revise CF_ADD_LIBS macro to prepend rather than append libraries.
-+	+ add "xterm-mono" to help packagers (report by Sven Joachim) -TD
-+
- 20191026
- 	+ add a note in man/curs_add_wch.3x about Unicode terminology for the
- 	  line-drawing characters (report by Nick Black).
-Index: VERSION
---- ncurses-6.1-20191026+/VERSION	2019-10-26 08:56:47.000000000 +0000
-+++ ncurses-6.1-20191102/VERSION	2019-11-02 09:43:29.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191026
-+5:0:10	6.1	20191102
-Index: aclocal.m4
-Prereq:  1.884 
---- ncurses-6.1-20191026+/aclocal.m4	2019-09-27 21:08:36.000000000 +0000
-+++ ncurses-6.1-20191102/aclocal.m4	2019-11-02 20:32:27.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.884 2019/09/27 21:08:36 tom Exp $
-+dnl $Id: aclocal.m4,v 1.885 2019/11/02 20:32:27 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -355,19 +355,19 @@
- dnl $1 = libraries to add, with the "-l", etc.
- dnl $2 = variable to update (default $LIBS)
- AC_DEFUN([CF_ADD_LIBS],[
--cf_add_libs="$1"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in [$]ifelse($2,,LIBS,[$2])
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="[$]ifelse($2,,LIBS,[$2])"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $1; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- ifelse($2,,LIBS,[$2])="$cf_add_libs"
- ])dnl
-Index: configure
---- ncurses-6.1-20191026+/configure	2019-09-27 22:50:51.000000000 +0000
-+++ ncurses-6.1-20191102/configure	2019-11-02 20:33:48.000000000 +0000
-@@ -5619,19 +5619,19 @@
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 		cf_save_LIBS="$LIBS"
- 
--cf_add_libs="${LD_RPATH_OPT}$libdir"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in ${LD_RPATH_OPT}$libdir; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -6757,19 +6757,19 @@
- 
- if test "$cf_have_dlsym" = yes ; then
- 	test "$cf_have_libdl" = yes && {
--cf_add_libs="-ldl"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -ldl; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
-  }
-@@ -6854,19 +6854,19 @@
- CF_EOF
- cf_save_LIBS="$LIBS"
- 
--cf_add_libs="-lgpm"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lgpm; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -6900,54 +6900,54 @@
- 
- 		SHLIB_LIST="-ldl $SHLIB_LIST"
- 
--cf_add_libs="-ldl"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $PRIVATE_LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$PRIVATE_LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -ldl; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- PRIVATE_LIBS="$cf_add_libs"
- 
- 	else
- 		SHLIB_LIST="-lgpm $SHLIB_LIST"
- 
--cf_add_libs="-lgpm"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $TEST_LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$TEST_LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lgpm; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- TEST_LIBS="$cf_add_libs"
- 
--cf_add_libs="-lgpm"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $PRIVATE_LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$PRIVATE_LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lgpm; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- PRIVATE_LIBS="$cf_add_libs"
- 
-@@ -7191,19 +7191,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -7325,19 +7325,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -7413,19 +7413,19 @@
- echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
- if test $ac_cv_lib_pcre2_posix_regcomp = yes; then
- 
--cf_add_libs="-lpcre2-posix"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lpcre2-posix; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -7481,19 +7481,19 @@
- echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
- if test $ac_cv_lib_pcreposix_regcomp = yes; then
- 
--cf_add_libs="-lpcreposix"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lpcreposix; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -12151,19 +12151,19 @@
- 	done
- fi
- 
--cf_add_libs="$cf_cv_library_file_utf8"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_cv_library_file_utf8; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -14612,19 +14612,19 @@
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
--cf_add_libs="-l$cf_lib_pthread"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_lib_pthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -14672,19 +14672,19 @@
- 
- 	if test "$with_pthread" = yes ; then
- 
--cf_add_libs="-l$cf_lib_pthread"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_lib_pthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -14878,19 +14878,19 @@
- 	if test "x$cf_cv_weak_symbols" = xyes ; then
- 		PTHREAD=-lpthread
- 
--cf_add_libs="-lpthread"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $PRIVATE_LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$PRIVATE_LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- PRIVATE_LIBS="$cf_add_libs"
- 
-@@ -14922,51 +14922,51 @@
- # remove pthread library from $LIBS
- LIBS=`echo "$LIBS" | sed -e 's/-lpthread[ 	]//g' -e 's/-lpthread$//'`
- 
--cf_add_libs="-lpthread"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $TEST_LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$TEST_LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- TEST_LIBS="$cf_add_libs"
- 
--cf_add_libs="-lpthread"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $TEST_LIBS2
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$TEST_LIBS2"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- TEST_LIBS2="$cf_add_libs"
- 
--cf_add_libs="-lpthread"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $PRIVATE_LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$PRIVATE_LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- PRIVATE_LIBS="$cf_add_libs"
- 
-@@ -16145,19 +16145,19 @@
- echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
- if test $ac_cv_lib_bsd_strlcat = yes; then
- 
--cf_add_libs="-lbsd"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lbsd; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -17243,19 +17243,19 @@
- #define HAVE_GETTIMEOFDAY 1
- EOF
- 
--cf_add_libs="-lbsd"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lbsd; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -17794,19 +17794,19 @@
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
--cf_add_libs="-l$cf_regex_lib"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_regex_lib; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -17932,19 +17932,19 @@
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
--cf_add_libs="-lgen"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lgen; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -18759,19 +18759,19 @@
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
- 
--cf_add_libs="-linet"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -linet; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -22011,19 +22011,19 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	test $cf_cv_lib_util = yes && {
--cf_add_libs="-lutil"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lutil; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
-  }
-@@ -22089,19 +22089,19 @@
- 
- 	if test "x$cf_cv_lib_util" = xyes ; then
- 
--cf_add_libs="-lutil"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $TEST_LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$TEST_LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lutil; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- TEST_LIBS="$cf_add_libs"
- 
-@@ -22566,19 +22566,19 @@
- 	cf_save_libs="$LIBS"
- 	if test -n "$cf_db_libs"; then
- 
--cf_add_libs="-l$cf_db_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_db_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -22680,19 +22680,19 @@
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
- 
--cf_add_libs="-l$cf_cv_hashed_db_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_cv_hashed_db_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -22924,19 +22924,19 @@
- 			cf_save="$LIBS"
- 			LIBS="$LIBS $CXXLIBS"
- 
--cf_add_libs="-l$cf_stdcpp_libname"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_stdcpp_libname; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -22979,19 +22979,19 @@
- echo "$as_me:22979: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- 		test "$cf_cv_libstdcpp" = yes && {
--cf_add_libs="-l$cf_stdcpp_libname"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $CXXLIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$CXXLIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_stdcpp_libname; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- CXXLIBS="$cf_add_libs"
-  }
-@@ -23059,19 +23059,19 @@
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
--cf_add_libs="-l$cf_gpp_libname"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_gpp_libname; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -23103,19 +23103,19 @@
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
--cf_add_libs="-l$cf_gpp_libname"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $CXXLIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$CXXLIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_gpp_libname; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- CXXLIBS="$cf_add_libs"
- 
-@@ -23163,19 +23163,19 @@
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
--cf_add_libs="-l$cf_gpp_libname"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $CXXLIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$CXXLIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_gpp_libname; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- CXXLIBS="$cf_add_libs"
- 
-Index: dist.mk
-Prereq:  1.1312 
---- ncurses-6.1-20191026+/dist.mk	2019-10-26 08:56:47.000000000 +0000
-+++ ncurses-6.1-20191102/dist.mk	2019-11-02 09:43:29.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1312 2019/10/26 08:56:47 tom Exp $
-+# $Id: dist.mk,v 1.1313 2019/11/02 09:43:29 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191026
-+NCURSES_PATCH = 20191102
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: misc/terminfo.src
---- ncurses-6.1-20191026+/misc/terminfo.src	2019-10-26 17:00:56.000000000 +0000
-+++ ncurses-6.1-20191102/misc/terminfo.src	2019-11-02 16:55:15.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.766 $
--#	$Date: 2019/10/26 17:00:56 $
-+#	$Revision: 1.767 $
-+#	$Date: 2019/11/02 16:55:15 $
- #
- # 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
-@@ -4404,6 +4404,15 @@
- 	use=xterm+kbs, use=vt100+enq,
- xterm-old|antique xterm version,
- 	use=xterm-r6,
-+# The monochrome version began as a copy of "xtermm" (from Solaris), and was
-+# initially part of the xterm sources (in XFree86).  But "xterm" continued to
-+# grow, while "xterm-mono" had none of the newer features.  Additionally,
-+# inheriting from "xtermm" runs into several problems, including different
-+# function keys as well as the fact that the mouse support is not compatible. 
-+# This entry restores the original intent, intentionally not an alias to
-+# simplify maintenance -TD
-+xterm-mono|monochrome xterm,
-+	use=xterm-r6,
- # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up.
- # The name has been changed and some aliases have been removed.
- xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
-@@ -26385,4 +26394,7 @@
- #	+ modify linux-16color to accommodate Linux console driver change in
- #	  early 2018 (report by Dino Petrucci).
- #
-+# 2019-11-02
-+#	+ add "xterm-mono" to help packagers (report by Sven Joachim) -TD
-+#
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: ncurses/base/lib_getch.c
-Prereq:  1.137 
---- ncurses-6.1-20191026+/ncurses/base/lib_getch.c	2018-06-24 00:06:37.000000000 +0000
-+++ ncurses-6.1-20191102/ncurses/base/lib_getch.c	2019-11-03 00:11:16.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2016,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2018,2019 Free 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 
- 
--MODULE_ID("$Id: lib_getch.c,v 1.137 2018/06/24 00:06:37 tom Exp $")
-+MODULE_ID("$Id: lib_getch.c,v 1.138 2019/11/03 00:11:16 tom Exp $")
- 
- #include 
- 
-@@ -69,16 +69,20 @@
- NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_DCLx int value)
- {
-     int code = OK;
--#if USE_REENTRANT
--    if (SP_PARM) {
--	SET_ESCDELAY(value);
--    } else {
-+    if (value < 0) {
- 	code = ERR;
--    }
-+    } else {
-+#if USE_REENTRANT
-+	if (SP_PARM) {
-+	    SET_ESCDELAY(value);
-+	} else {
-+	    code = ERR;
-+	}
- #else
--    (void) SP_PARM;
--    ESCDELAY = value;
-+	(void) SP_PARM;
-+	ESCDELAY = value;
- #endif
-+    }
-     return code;
- }
- 
-@@ -87,12 +91,16 @@
- set_escdelay(int value)
- {
-     int code;
-+    if (value < 0) {
-+	code = ERR;
-+    } else {
- #if USE_REENTRANT
--    code = NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value);
-+	code = NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value);
- #else
--    ESCDELAY = value;
--    code = OK;
-+	ESCDELAY = value;
-+	code = OK;
- #endif
-+    }
-     return code;
- }
- #endif
-Index: ncurses/tinfo/lib_setup.c
-Prereq:  1.204 
---- ncurses-6.1-20191026+/ncurses/tinfo/lib_setup.c	2019-08-10 17:08:00.000000000 +0000
-+++ ncurses-6.1-20191102/ncurses/tinfo/lib_setup.c	2019-11-03 00:07:45.000000000 +0000
-@@ -48,7 +48,7 @@
- #include 
- #endif
- 
--MODULE_ID("$Id: lib_setup.c,v 1.204 2019/08/10 17:08:00 tom Exp $")
-+MODULE_ID("$Id: lib_setup.c,v 1.206 2019/11/03 00:07:45 tom Exp $")
- 
- /****************************************************************************
-  *
-@@ -173,16 +173,20 @@
- NCURSES_SP_NAME(set_tabsize) (NCURSES_SP_DCLx int value)
- {
-     int code = OK;
--#if USE_REENTRANT
--    if (SP_PARM) {
--	SP_PARM->_TABSIZE = value;
--    } else {
-+    if (value <= 0) {
- 	code = ERR;
--    }
-+    } else {
-+#if USE_REENTRANT
-+	if (SP_PARM) {
-+	    SP_PARM->_TABSIZE = value;
-+	} else {
-+	    code = ERR;
-+	}
- #else
--    (void) SP_PARM;
--    TABSIZE = value;
-+	(void) SP_PARM;
-+	TABSIZE = value;
- #endif
-+    }
-     return code;
- }
- 
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20191026+/package/debian-mingw/changelog	2019-10-26 08:56:47.000000000 +0000
-+++ ncurses-6.1-20191102/package/debian-mingw/changelog	2019-11-02 09:43:29.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191026) unstable; urgency=low
-+ncurses6 (6.1+20191102) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 26 Oct 2019 04:56:47 -0400
-+ -- Thomas E. Dickey   Sat, 02 Nov 2019 05:43:29 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20191026+/package/debian-mingw64/changelog	2019-10-26 08:56:47.000000000 +0000
-+++ ncurses-6.1-20191102/package/debian-mingw64/changelog	2019-11-02 09:43:29.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191026) unstable; urgency=low
-+ncurses6 (6.1+20191102) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 26 Oct 2019 04:56:47 -0400
-+ -- Thomas E. Dickey   Sat, 02 Nov 2019 05:43:29 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20191026+/package/debian/changelog	2019-10-26 08:56:47.000000000 +0000
-+++ ncurses-6.1-20191102/package/debian/changelog	2019-11-02 09:43:29.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191026) unstable; urgency=low
-+ncurses6 (6.1+20191102) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 26 Oct 2019 04:56:47 -0400
-+ -- Thomas E. Dickey   Sat, 02 Nov 2019 05:43:29 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.358 
---- ncurses-6.1-20191026+/package/mingw-ncurses.nsi	2019-10-26 08:56:47.000000000 +0000
-+++ ncurses-6.1-20191102/package/mingw-ncurses.nsi	2019-11-02 09:43:29.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.358 2019/10/26 08:56:47 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.359 2019/11/02 09:43:29 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "1026"
-+!define VERSION_MMDD  "1102"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20191026+/package/mingw-ncurses.spec	2019-10-26 08:56:47.000000000 +0000
-+++ ncurses-6.1-20191102/package/mingw-ncurses.spec	2019-11-02 09:43:29.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20191026
-+Release: 20191102
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20191026+/package/ncurses.spec	2019-10-26 08:56:47.000000000 +0000
-+++ ncurses-6.1-20191102/package/ncurses.spec	2019-11-02 09:43:29.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20191026
-+Release: 20191102
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20191026+/package/ncursest.spec	2019-10-26 08:56:47.000000000 +0000
-+++ ncurses-6.1-20191102/package/ncursest.spec	2019-11-02 09:43:29.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20191026
-+Release: 20191102
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/aclocal.m4
-Prereq:  1.165 
---- ncurses-6.1-20191026+/test/aclocal.m4	2019-09-07 23:58:37.000000000 +0000
-+++ ncurses-6.1-20191102/test/aclocal.m4	2019-11-02 20:55:33.000000000 +0000
-@@ -26,7 +26,7 @@
- dnl authorization.                                                           *
- dnl***************************************************************************
- dnl
--dnl $Id: aclocal.m4,v 1.165 2019/09/07 23:58:37 tom Exp $
-+dnl $Id: aclocal.m4,v 1.166 2019/11/02 20:55:33 tom Exp $
- dnl
- dnl Author: Thomas E. Dickey
- dnl
-@@ -280,7 +280,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27
-+dnl CF_ADD_LIBS version: 3 updated: 2019/11/02 16:47:33
- dnl -----------
- dnl Add one or more libraries, used to enforce consistency.  Libraries are
- dnl prepended to an existing list, since their dependencies are assumed to
-@@ -289,19 +289,19 @@
- dnl $1 = libraries to add, with the "-l", etc.
- dnl $2 = variable to update (default $LIBS)
- AC_DEFUN([CF_ADD_LIBS],[
--cf_add_libs="$1"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in [$]ifelse($2,,LIBS,[$2])
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="[$]ifelse($2,,LIBS,[$2])"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $1; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- ifelse($2,,LIBS,[$2])="$cf_add_libs"
- ])dnl
-Index: test/configure
---- ncurses-6.1-20191026+/test/configure	2019-09-07 23:59:06.000000000 +0000
-+++ ncurses-6.1-20191102/test/configure	2019-11-02 20:55:58.000000000 +0000
-@@ -3349,19 +3349,19 @@
- echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
- if test $ac_cv_lib_bsd_strlcat = yes; then
- 
--cf_add_libs="-lbsd"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lbsd; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -6374,19 +6374,19 @@
- echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
- if test $ac_cv_lib_mytinfo_tgoto = yes; then
- 
--cf_add_libs="-lmytinfo"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lmytinfo; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -6451,19 +6451,19 @@
- echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
- if test $ac_cv_lib_cur_colr_initscr = yes; then
- 
--cf_add_libs="-lcur_colr"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lcur_colr; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -6524,19 +6524,19 @@
- 
- 			# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
- 
--cf_add_libs="-lHcurses"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lHcurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -6679,19 +6679,19 @@
- 	done
- fi
- 
--cf_add_libs="-lcurses -ltermcap"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lcurses -ltermcap; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -7508,19 +7508,19 @@
- 	done
- fi
- 
--cf_add_libs="$cf_cv_library_file_utf8"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_cv_library_file_utf8; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -7641,19 +7641,19 @@
- 
- fi
- 
--cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -8018,19 +8018,19 @@
- 
- fi
- 
--cf_add_libs="`$NCURSES_CONFIG --libs`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -9036,38 +9036,38 @@
- 	;;
- esac
- 
--cf_add_libs="$cf_ncurses_LIBS"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
- then
- 
--cf_add_libs="-l$cf_nculib_root"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -9471,19 +9471,19 @@
- 
- fi
- 
--cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -9848,19 +9848,19 @@
- 
- fi
- 
--cf_add_libs="`$NCURSES_CONFIG --libs`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -10866,38 +10866,38 @@
- 	;;
- esac
- 
--cf_add_libs="$cf_ncurses_LIBS"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
- then
- 
--cf_add_libs="-l$cf_nculib_root"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -12463,19 +12463,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -12672,19 +12672,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -12856,19 +12856,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -12928,19 +12928,19 @@
- echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
- if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
- 
--cf_add_libs="-lXext"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lXext; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -13070,19 +13070,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -13207,19 +13207,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -13344,19 +13344,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -13481,19 +13481,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -13622,19 +13622,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -13811,19 +13811,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -14017,19 +14017,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -14146,19 +14146,19 @@
- 
- fi
- 
--cf_add_libs="$cf_pkgconfig_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -14469,19 +14469,19 @@
- echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
- if test $ac_cv_lib_X11_XOpenDisplay = yes; then
- 
--cf_add_libs="-lX11"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lX11; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -14725,19 +14725,19 @@
- 			cf_test=XawSimpleMenuAddGlobalActions
- 			if test $cf_path != default ; then
- 
--cf_add_libs="-L$cf_path/lib $cf_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -L$cf_path/lib $cf_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -14745,19 +14745,19 @@
- echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
- 			else
- 
--cf_add_libs="$cf_libs"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in $cf_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -15007,19 +15007,19 @@
- 
- fi
- 
--cf_add_libs="`$XCURSES_CONFIG --libs`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$XCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -15238,19 +15238,19 @@
- echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
- if test $ac_cv_lib_X11_XOpenDisplay = yes; then
- 
--cf_add_libs="-lX11"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lX11; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -15262,19 +15262,19 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--cf_add_libs="-lXCurses"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lXCurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -15448,19 +15448,19 @@
- if test "$cf_cv_ncurses_pthreads" = yes
- then
- 
--cf_add_libs="-lpthread"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -15723,19 +15723,19 @@
- 
- fi
- 
--cf_add_libs="`$PKG_CONFIG --libs panel$cf_cv_libtype`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$PKG_CONFIG --libs panel$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -15872,19 +15872,19 @@
- 
- cf_upper=`echo "have_libpanel" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--cf_add_libs="-lpanel$cf_cv_libtype"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lpanel$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -16098,19 +16098,19 @@
- 
- fi
- 
--cf_add_libs="`$PKG_CONFIG --libs menu$cf_cv_libtype`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$PKG_CONFIG --libs menu$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -16247,19 +16247,19 @@
- 
- cf_upper=`echo "have_libmenu" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--cf_add_libs="-lmenu$cf_cv_libtype"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lmenu$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -16474,19 +16474,19 @@
- 
- fi
- 
--cf_add_libs="`$PKG_CONFIG --libs form$cf_cv_libtype`"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in `$PKG_CONFIG --libs form$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -16623,19 +16623,19 @@
- 
- cf_upper=`echo "have_libform" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--cf_add_libs="-lform$cf_cv_libtype"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lform$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
-@@ -18371,19 +18371,19 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	test $cf_cv_lib_util = yes && {
--cf_add_libs="-lutil"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lutil; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
-  }
-@@ -18449,19 +18449,19 @@
- 
- 	if test "x$cf_cv_lib_util" = xyes ; then
- 
--cf_add_libs="-lutil"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $TEST_LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$TEST_LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in -lutil; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- TEST_LIBS="$cf_add_libs"
- 
-@@ -20501,19 +20501,19 @@
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 		cf_save_LIBS="$LIBS"
- 
--cf_add_libs="${LD_RPATH_OPT}$libdir"
--# Filter out duplicates - this happens with badly-designed ".pc" files...
--for cf_add_1lib in $LIBS
--do
--	for cf_add_2lib in $cf_add_libs
--	do
--		if test "x$cf_add_1lib" = "x$cf_add_2lib"
--		then
-+cf_add_libs="$LIBS"
-+# reverse order
-+cf_add_0lib=
-+for cf_add_1lib in ${LD_RPATH_OPT}$libdir; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-+# filter duplicates
-+for cf_add_1lib in $cf_add_0lib; do
-+	for cf_add_2lib in $cf_add_libs; do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
- 			cf_add_1lib=
- 			break
- 		fi
- 	done
--	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
- done
- LIBS="$cf_add_libs"
- 
diff --git a/ncurses-6.1-20191109.patch b/ncurses-6.1-20191109.patch
deleted file mode 100644
index 0c39ad7..0000000
--- a/ncurses-6.1-20191109.patch
+++ /dev/null
@@ -1,482 +0,0 @@
-# ncurses 6.1 - patch 20191109 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191109.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Nov 10 00:43:22 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                             |   11 +++
-# VERSION                          |    2 
-# dist.mk                          |    4 -
-# misc/terminfo.src                |  115 ++++++++++++++++++++++---------------
-# package/debian-mingw/changelog   |    4 -
-# package/debian-mingw64/changelog |    4 -
-# package/debian/changelog         |    4 -
-# package/mingw-ncurses.nsi        |    4 -
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# package/ncursest.spec            |    2 
-# progs/tic.c                      |    5 -
-# 12 files changed, 96 insertions(+), 63 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3401 
---- ncurses-6.1-20191102+/NEWS	2019-11-03 00:12:08.000000000 +0000
-+++ ncurses-6.1-20191109/NEWS	2019-11-10 00:18:59.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3401 2019/11/03 00:12:08 tom Exp $
-+-- $Id: NEWS,v 1.3404 2019/11/10 00:18:59 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,15 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191109
-+	+ add warning-check in tic for terminals with parm_dch vs parm_ich.
-+	+ drop ich1 from rxvt-basic, Eterm and mlterm to improve compatibility
-+	  with old non-curses programs -TD
-+	+ reviewed st 0.8.2, updated some details -TD
-+	+ use ansi+rep several places -TD
-+	+ corrected tic's check for ich1 (report by Sebastian J. Bronner,
-+	  cf: 20020901).
-+
- 20191102
- 	+ check parameter of set_escdelay, return ERR if negative.
- 	+ check parameter of set_tabsize, return ERR if not greater than zero
-Index: VERSION
---- ncurses-6.1-20191102+/VERSION	2019-11-02 09:43:29.000000000 +0000
-+++ ncurses-6.1-20191109/VERSION	2019-11-06 09:37:05.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191102
-+5:0:10	6.1	20191109
-Index: dist.mk
-Prereq:  1.1313 
---- ncurses-6.1-20191102+/dist.mk	2019-11-02 09:43:29.000000000 +0000
-+++ ncurses-6.1-20191109/dist.mk	2019-11-06 09:37:05.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1313 2019/11/02 09:43:29 tom Exp $
-+# $Id: dist.mk,v 1.1314 2019/11/06 09:37:05 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191102
-+NCURSES_PATCH = 20191109
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: misc/terminfo.src
---- ncurses-6.1-20191102+/misc/terminfo.src	2019-11-02 16:55:15.000000000 +0000
-+++ ncurses-6.1-20191109/misc/terminfo.src	2019-11-09 23:52:28.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.767 $
--#	$Date: 2019/11/02 16:55:15 $
-+#	$Revision: 1.773 $
-+#	$Date: 2019/11/09 23:52:28 $
- #
- # 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
-@@ -1404,9 +1404,8 @@
- 	kopt=\ENk, kpp=\E[V, kref=\ENl, kres=\ENp, krfr=\ENg,
- 	kri=\E[b, krpl=\ENr, krst=\ENj, ksav=\ENq, kslt=\E[T,
- 	ktbc=\ENd, kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m,
--	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\E[T, rmacs=^O,
--	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
--	rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
-+	rev=\E[7m, ri=\E[T, rmacs=^O, rmam=\E[?7l, rmso=\E[27m,
-+	rmul=\E[24m, rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
- 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
- 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
- 	     %=%t3%e%p1%d%;m,
-@@ -1416,7 +1415,8 @@
- 	    %|%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[3g,
--	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ecma+index,
-+	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ansi+rep,
-+	use=ecma+index,
- #
- qansi|QNX ansi with console writes,
- 	daisy, xhpa, use=qansi-g,
-@@ -5881,7 +5881,7 @@
- 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
- 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
- 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
--	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
-+	il=\E[%p1%dL, il1=\E[L, ind=\n,
- 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
- 	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
- 	kdch1=\E[3~, kend=\EOF, kent=\EOM, kfnd=\E[1~, khome=\EOH,
-@@ -5950,8 +5950,8 @@
- 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
- 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
- 	enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
--	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
--	il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l,
-+	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
-+	ind=\n, is1=\E[?47l\E=\E[?1l,
- 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
- 	kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
- 	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
-@@ -6202,8 +6202,7 @@
- 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
- 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
- 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
--	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
--	is1=\E[?47l\E>\E[?1l,
-+	il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E>\E[?1l,
- 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
- 	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H,
- 	kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
-@@ -6508,7 +6507,29 @@
- # st.suckless.org
- 
- st|stterm| simpleterm,
--	use=st-0.7,
-+	use=st-0.8,
-+
-+# Reviewed 0.8.2:
-+# In tack,
-+#	there is some problem turning off line-drawing
-+#	shift+control function-keys do nothing; shift+control cursor keys work
-+#	the padding tests make the terminal non-functional.
-+# In vttest,
-+#	SD/SU work
-+#	SL/SR/REP do not work
-+#	ECMA-48 cursor movement works, e.g., CHA, CBT, etc.
-+#
-+# This entry discards the ccc/initc capabilities from st-0.7 because they
-+# belong in st-256color.
-+st-0.8|simpleterm 0.7,
-+	dim=\E[2m, kcbt@, kent@, oc=\E]104\007,
-+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
-+	    %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
-+	Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
-+	kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
-+	kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
-+	kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,
-+	use=ecma+strikeout, use=st-0.6,
- 
- # Reviewed 0.7:
- #	dim is intermittent, sometimes works, sometimes does not
-@@ -6660,14 +6681,15 @@
- 	use=ecma+index,
- st-16color|stterm-16color|simpleterm with 16-colors,
- 	use=ibm+16color, use=st,
--# 256 colors "works", but when running xterm's test-scripts, some garbage is
--# shown in the titlebar.
-+# Tested with st 0.8.2
-+# The issue with the titlebar is fixed, though st is very slow.
-+# In st 0.7, 256 colors "works", but when running xterm's test-scripts, some
-+# garbage is shown in the titlebar.
- #
- # terminal wants to use TERM=stterm-256color, but that is longer than 14
- # characters, making the choice nonportable.
- st-256color|stterm-256color|simpleterm with 256 colors,
--	ccc@,
--	initc@, oc@, use=xterm+256color, use=st,
-+	use=xterm+256color, use=st,
- 
- #### TERMINATOR
- # https://github.com/software-jessies-org/jessies/wiki/Terminator
-@@ -13307,16 +13329,15 @@
- 	kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh,
- 	kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2, mc0=\E[0i,
- 	mc4=\E[?8i, mc5=\E[?4i, mgc=\E\:, nel=\EE,
--	pln=\E[%p1%dp%p2%:-16s, rc=\E8,
--	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
--	rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmso=\E[m, rmul=\E[m,
--	rmxon=\E[29;1|, rs2=\E[5;0|, sc=\E7,
-+	pln=\E[%p1%dp%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM,
-+	rmacs=^O, rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmso=\E[m,
-+	rmul=\E[m, rmxon=\E[29;1|, rs2=\E[5;0|, sc=\E7,
- 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
- 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smgl=\E4, smgr=\E5, smir=\E[4h,
- 	smkx=\E[19;1|, smln=\E?, smso=\E[7m, smul=\E[4m,
- 	smxon=\E[29;0|, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
--	use=ecma+index,
-+	use=ansi+rep, use=ecma+index,
- 
- # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
- att500|att513|AT&T 513 using page mode,
-@@ -13357,8 +13378,7 @@
- 	pfloc=\E[%p1%d;%p2%l%d;2;0p\s\s\sF%p1%d\s\s\s\s\s\s\s\s\s\s
- 	      \s%p2%s,
- 	pfx=\E[%p1%d;%p2%l%d;1;0p   F%p1%d           %p2%s,
--	pln=\E[%p1%dp%p2%:-16s, rc=\E8,
--	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM,
-+	pln=\E[%p1%dp%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM,
- 	rin=\E[%p1%dF, rmacs=^O, rmir=\E[4l,
- 	rmkx=\E[19;0|\E[21;1|\212, rmln=\E<, rmso=\E[m,
- 	rmul=\E[m,
-@@ -13369,7 +13389,7 @@
- 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smir=\E[4h,
- 	smkx=\E[19;1|\E[21;4|\Eent, smln=\E?, smso=\E[7m,
--	smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
-+	smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd, use=ansi+rep,
- 
- # 01-07-88
- # printer must be set to EMUL ANSI to accept ESC codes
-@@ -13803,15 +13823,15 @@
- 	mc0=\E[i, mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
- 	pfx=\E[%p1%d;%p2%l%02dq%?%p1%{9}%<%t\s\s\sF%p1%1d\s\s\s\s\s
- 	    \s\s\s\s\s\s%;%p2%s,
--	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8,
--	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
--	rmir=\E[4l, rmln=\E[2p, rmso=\E[27m, rmul=\E[24m,
--	rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|, sc=\E7,
-+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
-+	ri=\EM, rmacs=^O, rmir=\E[4l, rmln=\E[2p, rmso=\E[27m,
-+	rmul=\E[24m, rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|,
-+	sc=\E7,
- 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
- 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smln=\E[p, smso=\E[7m,
- 	smul=\E[4m, smxon=\E[53;0|, tbc=\E[3g,
--	tsl=\E7\E[99;%i%p1%dx,
-+	tsl=\E7\E[99;%i%p1%dx, use=ansi+rep,
- 
- # This entry was modified 3/13/90 by JWE.
- # fixes include additions of , correcting , and modification
-@@ -13858,15 +13878,15 @@
- 	pfx=\E[%?%p1%{25}%<%t%p1%e%p1%{24}%-%;%d;%p2%l%02d%?%p1%{25}
- 	    %<%tq\s\s\sSYS\s\s\s\s\sF%p1%:-2d\s\s%e;0;3q%;%p2%s,
- 	pfxl=\E[%p1%d;%p2%l%02d;0;0q%p3%:-16.16s%p2%s,
--	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8,
--	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
--	rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h, rmso=\E[27m,
--	rmul=\E[24m, rmxon=\E[?21l, rs2=\Ec\E[?3l, sc=\E7,
-+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
-+	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h,
-+	rmso=\E[27m, rmul=\E[24m, rmxon=\E[?21l, rs2=\Ec\E[?3l,
-+	sc=\E7,
- 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
- 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
- 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
- 	smln=\E[?13l, smso=\E[7m, smul=\E[4m, smxon=\E[?21h,
--	swidm=\E#6, tsl=\E7\E[;%i%p1%dx,
-+	swidm=\E#6, tsl=\E7\E[;%i%p1%dx, use=ansi+rep,
- att730-41|730MTG-41|AT&T 730-41 windowing terminal Version,
- 	lines#41, use=att730,
- att730-24|730MTG-24|AT&T 730-24 windowing terminal Version,
-@@ -14340,8 +14360,7 @@
- 	kf21=\EOU, kf22=\EOV, kf23=\EOW, kf24=\EOX, kf3=\EOC,
- 	kf4=\EOD, kf5=\EOE, kf6=\EOF, kf7=\EOG, kf8=\EOH, kf9=\EOI,
- 	khome=\E[H, kich1=\E[@, kil1=\E[L, krmir=\E6, mc0=\E[0i,
--	mc4=^C, mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8,
--	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m,
-+	mc4=^C, mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8, rev=\E[7m,
- 	rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E
- 	     \\,
- 	rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7,
-@@ -14351,7 +14370,7 @@
- 	smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E
- 	     \\,
- 	smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
--	vpa=\E[%p1%{1}%+%dd,
-+	vpa=\E[%p1%{1}%+%dd, use=ansi+rep,
- 
- aaa+rv|ann arbor ambassador in reverse video,
- 	blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
-@@ -15455,17 +15474,16 @@
- 	kf4=\EOS, khome=\E[H, kich1=\E\001\r, kil1=\E\003\r,
- 	ll=\E[24H, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
- 	pfloc=\E[%p1%d;0u#%p2%s#, pfx=\E[%p1%d;1u#%p2%s#,
--	prot=\E[99m, rc=\E8, rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m,
--	ri=\EM$<4>, rmacs=\016$<1>, rmcup=\E[w\E2\r\n,
--	rmir=\E[4l, rmkx=\E[!z\E[0;2u, rmso=\E[7!{, rmul=\E[4!{,
--	sc=\E7,
-+	prot=\E[99m, rc=\E8, rev=\E[7m, ri=\EM$<4>, rmacs=\016$<1>,
-+	rmcup=\E[w\E2\r\n, rmir=\E[4l, rmkx=\E[!z\E[0;2u,
-+	rmso=\E[7!{, rmul=\E[4!{, sc=\E7,
- 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
- 	    %;%?%p7%t8;%;%?%p8%t99;%;m%?%p5%t\E[1!{%;%?%p9%t\017%e
- 	    \016%;$<1>,
- 	sgr0=\E[m\016$<1>, smacs=\017$<1>,
- 	smcup=\E[=4l\E[1;24w\E2\r, smir=\E[4h,
- 	smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
--	vpa=\E[%p1%{1}%+%dd,
-+	vpa=\E[%p1%{1}%+%dd, use=ansi+rep,
- 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,
-@@ -19546,13 +19564,12 @@
- 	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%p1%{1}%+%dG,
- 	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
- 	il1=\E[L, ind=\n, invis=\E[8m, kbs=^H, kcub1=\E[D,
--	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H,
--	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, rmam=\E[?7l,
--	rmso=\E[m, rmul=\E[m,
-+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, rev=\E[7m,
-+	rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
- 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
- 	    %;%?%p7%t8;%;m,
- 	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
--	vpa=\E[%p1%{1}%+%dd,
-+	vpa=\E[%p1%{1}%+%dd, use=ansi+rep,
- # The tek4125 emulates a vt100 incorrectly - the scrolling region
- # command is ignored.  The following entry replaces  with the needed
- # , , and ; removes some cursor pad commands that the tek4125
-@@ -26397,4 +26414,10 @@
- # 2019-11-02
- #	+ add "xterm-mono" to help packagers (report by Sven Joachim) -TD
- #
-+# 2019-11-09
-+#	+ drop ich1 from rxvt-basic, Eterm and mlterm to improve compatibility
-+#	  with old non-curses programs -TD
-+#	+ reviewed st 0.8.2, updated some details -TD
-+#	+ use ansi+rep several places -TD
-+#
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20191102+/package/debian-mingw/changelog	2019-11-02 09:43:29.000000000 +0000
-+++ ncurses-6.1-20191109/package/debian-mingw/changelog	2019-11-06 09:37:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191102) unstable; urgency=low
-+ncurses6 (6.1+20191109) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 02 Nov 2019 05:43:29 -0400
-+ -- Thomas E. Dickey   Wed, 06 Nov 2019 04:37:04 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20191102+/package/debian-mingw64/changelog	2019-11-02 09:43:29.000000000 +0000
-+++ ncurses-6.1-20191109/package/debian-mingw64/changelog	2019-11-06 09:37:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191102) unstable; urgency=low
-+ncurses6 (6.1+20191109) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 02 Nov 2019 05:43:29 -0400
-+ -- Thomas E. Dickey   Wed, 06 Nov 2019 04:37:05 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20191102+/package/debian/changelog	2019-11-02 09:43:29.000000000 +0000
-+++ ncurses-6.1-20191109/package/debian/changelog	2019-11-06 09:37:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191102) unstable; urgency=low
-+ncurses6 (6.1+20191109) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 02 Nov 2019 05:43:29 -0400
-+ -- Thomas E. Dickey   Wed, 06 Nov 2019 04:37:04 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.359 
---- ncurses-6.1-20191102+/package/mingw-ncurses.nsi	2019-11-02 09:43:29.000000000 +0000
-+++ ncurses-6.1-20191109/package/mingw-ncurses.nsi	2019-11-06 09:37:05.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.359 2019/11/02 09:43:29 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.360 2019/11/06 09:37:05 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "1102"
-+!define VERSION_MMDD  "1109"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20191102+/package/mingw-ncurses.spec	2019-11-02 09:43:29.000000000 +0000
-+++ ncurses-6.1-20191109/package/mingw-ncurses.spec	2019-11-06 09:37:05.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20191102
-+Release: 20191109
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20191102+/package/ncurses.spec	2019-11-02 09:43:29.000000000 +0000
-+++ ncurses-6.1-20191109/package/ncurses.spec	2019-11-06 09:37:05.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20191102
-+Release: 20191109
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20191102+/package/ncursest.spec	2019-11-02 09:43:29.000000000 +0000
-+++ ncurses-6.1-20191109/package/ncursest.spec	2019-11-06 09:37:05.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20191102
-+Release: 20191109
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/tic.c
-Prereq:  1.279 
---- ncurses-6.1-20191102+/progs/tic.c	2019-10-15 22:18:29.000000000 +0000
-+++ ncurses-6.1-20191109/progs/tic.c	2019-11-09 18:51:36.000000000 +0000
-@@ -48,7 +48,7 @@
- #include 
- #include 
- 
--MODULE_ID("$Id: tic.c,v 1.279 2019/10/15 22:18:29 tom Exp $")
-+MODULE_ID("$Id: tic.c,v 1.281 2019/11/09 18:51:36 tom Exp $")
- 
- #define STDIN_NAME ""
- 
-@@ -2939,6 +2939,7 @@
-      * These are probably both or none.
-      */
-     PAIRED(parm_index, parm_rindex);
-+    PAIRED(parm_ich, parm_dch);
- 
-     /*
-      * These may be mismatched because the terminal description relies on
-@@ -3055,7 +3056,7 @@
-      * ncurses handles it.
-      */
-     if ((PRESENT(enter_insert_mode) || PRESENT(exit_insert_mode))
--	&& PRESENT(parm_ich)) {
-+	&& PRESENT(insert_character)) {
- 	_nc_warning("non-curses applications may be confused by ich1 with smir/rmir");
-     }
- 
diff --git a/ncurses-6.1-20191116.patch b/ncurses-6.1-20191116.patch
deleted file mode 100644
index 5e33db5..0000000
--- a/ncurses-6.1-20191116.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-# ncurses 6.1 - patch 20191116 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191116.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Nov 17 01:23:05 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                             |   10 +++++++++-
-# VERSION                          |    2 +-
-# configure                        |    4 ++--
-# configure.in                     |    6 +++---
-# dist.mk                          |    4 ++--
-# ncurses/Makefile.in              |   10 +++++-----
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# package/ncursest.spec            |    2 +-
-# 13 files changed, 33 insertions(+), 25 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3404 
---- ncurses-6.1-20191109+/NEWS	2019-11-10 00:18:59.000000000 +0000
-+++ ncurses-6.1-20191116/NEWS	2019-11-16 20:48:27.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3404 2019/11/10 00:18:59 tom Exp $
-+-- $Id: NEWS,v 1.3407 2019/11/16 20:48:27 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,14 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191116
-+	+ modify ncurses/Makefile.in to fix a case where Debian/testing changes
-+	  to the ld --as-needed configuration broke ncurses-examples test
-+	  packages.
-+	+ drop library-dependency on psapi for MinGW port, since win_driver.c
-+	  defines PSAPI_VERSION to 2, making it use GetProcessImageFileName
-+	  from kernel32.dll (prompted by patch by Simon Sobish, cf: 20140503).
-+
- 20191109
- 	+ add warning-check in tic for terminals with parm_dch vs parm_ich.
- 	+ drop ich1 from rxvt-basic, Eterm and mlterm to improve compatibility
-Index: VERSION
---- ncurses-6.1-20191109+/VERSION	2019-11-06 09:37:05.000000000 +0000
-+++ ncurses-6.1-20191116/VERSION	2019-11-16 15:09:15.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191109
-+5:0:10	6.1	20191116
-Index: configure
---- ncurses-6.1-20191109+/configure	2019-11-02 20:33:48.000000000 +0000
-+++ ncurses-6.1-20191116/configure	2019-11-16 15:59:28.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.690 .
-+# From configure.in Revision: 1.691 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20190901.
- #
-@@ -17119,7 +17119,7 @@
- case $cf_cv_system_name in
- (*mingw32*|*mingw64*)
- 	CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
--	LIBS=" -lpsapi $LIBS"
-+	# Note: WINVER may be a problem with Windows 10
- 	;;
- (*)
- echo "$as_me:17125: checking for gettimeofday" >&5
-Index: configure.in
-Prereq:  1.690 
---- ncurses-6.1-20191109+/configure.in	2019-09-27 21:12:34.000000000 +0000
-+++ ncurses-6.1-20191116/configure.in	2019-11-16 15:54:47.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.690 2019/09/27 21:12:34 tom Exp $
-+dnl $Id: configure.in,v 1.691 2019/11/16 15:54:47 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See https://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20170501)
--AC_REVISION($Revision: 1.690 $)
-+AC_REVISION($Revision: 1.691 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -1616,7 +1616,7 @@
- case $cf_cv_system_name in
- (*mingw32*|*mingw64*)
- 	CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
--	LIBS=" -lpsapi $LIBS"
-+	# Note: WINVER may be a problem with Windows 10
- 	;;
- (*)
- AC_CHECK_FUNC(gettimeofday,
-Index: dist.mk
-Prereq:  1.1314 
---- ncurses-6.1-20191109+/dist.mk	2019-11-06 09:37:05.000000000 +0000
-+++ ncurses-6.1-20191116/dist.mk	2019-11-16 15:09:15.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1314 2019/11/06 09:37:05 tom Exp $
-+# $Id: dist.mk,v 1.1315 2019/11/16 15:09:15 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191109
-+NCURSES_PATCH = 20191116
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/Makefile.in
-Prereq:  1.163 
---- ncurses-6.1-20191109+/ncurses/Makefile.in	2019-06-30 14:57:27.000000000 +0000
-+++ ncurses-6.1-20191116/ncurses/Makefile.in	2019-11-16 20:42:40.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: Makefile.in,v 1.163 2019/06/30 14:57:27 tom Exp $
-+# $Id: Makefile.in,v 1.164 2019/11/16 20:42:40 tom Exp $
- ##############################################################################
- # Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -126,12 +126,12 @@
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
- LINK		= $(LIBTOOL)
--LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
-+LDFLAGS		= @LDFLAGS@ @LD_MODEL@
- 
- SHLIB_DIRS	= -L../lib
--SHLIB_LIST	= $(SHLIB_DIRS) @SHLIB_LIST@
--TINFO_LIST	= $(SHLIB_DIRS) @TINFO_LIST@
--TICS_LIST	= $(SHLIB_DIRS) @TICS_LIST@
-+SHLIB_LIST	= $(SHLIB_DIRS) @SHLIB_LIST@ @LIBS@
-+TINFO_LIST	= $(SHLIB_DIRS) @TINFO_LIST@ @LIBS@
-+TICS_LIST	= $(SHLIB_DIRS) @TICS_LIST@ @LIBS@
- 
- RPATH_LIST	= @RPATH_LIST@
- RESULTING_SYMS	= @RESULTING_SYMS@
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20191109+/package/debian-mingw/changelog	2019-11-06 09:37:05.000000000 +0000
-+++ ncurses-6.1-20191116/package/debian-mingw/changelog	2019-11-16 15:09:15.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191109) unstable; urgency=low
-+ncurses6 (6.1+20191116) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Wed, 06 Nov 2019 04:37:04 -0500
-+ -- Thomas E. Dickey   Sat, 16 Nov 2019 10:09:15 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20191109+/package/debian-mingw64/changelog	2019-11-06 09:37:05.000000000 +0000
-+++ ncurses-6.1-20191116/package/debian-mingw64/changelog	2019-11-16 15:09:15.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191109) unstable; urgency=low
-+ncurses6 (6.1+20191116) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Wed, 06 Nov 2019 04:37:05 -0500
-+ -- Thomas E. Dickey   Sat, 16 Nov 2019 10:09:15 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20191109+/package/debian/changelog	2019-11-06 09:37:05.000000000 +0000
-+++ ncurses-6.1-20191116/package/debian/changelog	2019-11-16 15:09:15.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191109) unstable; urgency=low
-+ncurses6 (6.1+20191116) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Wed, 06 Nov 2019 04:37:04 -0500
-+ -- Thomas E. Dickey   Sat, 16 Nov 2019 10:09:15 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.360 
---- ncurses-6.1-20191109+/package/mingw-ncurses.nsi	2019-11-06 09:37:05.000000000 +0000
-+++ ncurses-6.1-20191116/package/mingw-ncurses.nsi	2019-11-16 15:09:15.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.360 2019/11/06 09:37:05 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.361 2019/11/16 15:09:15 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "1109"
-+!define VERSION_MMDD  "1116"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20191109+/package/mingw-ncurses.spec	2019-11-06 09:37:05.000000000 +0000
-+++ ncurses-6.1-20191116/package/mingw-ncurses.spec	2019-11-16 15:09:15.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20191109
-+Release: 20191116
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20191109+/package/ncurses.spec	2019-11-06 09:37:05.000000000 +0000
-+++ ncurses-6.1-20191116/package/ncurses.spec	2019-11-16 15:09:15.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20191109
-+Release: 20191116
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20191109+/package/ncursest.spec	2019-11-06 09:37:05.000000000 +0000
-+++ ncurses-6.1-20191116/package/ncursest.spec	2019-11-16 15:09:15.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20191109
-+Release: 20191116
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20191123.patch b/ncurses-6.1-20191123.patch
deleted file mode 100644
index e74c8f3..0000000
--- a/ncurses-6.1-20191123.patch
+++ /dev/null
@@ -1,387 +0,0 @@
-# ncurses 6.1 - patch 20191123 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191123.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Nov 24 02:39:05 UTC 2019
-# ------------------------------------------------------------------------------
-# Ada95/package/AdaCurses-doc.spec         |   12 ++++++++++--
-# Ada95/package/AdaCurses.spec             |   12 ++++++++++--
-# NEWS                                     |    6 +++++-
-# VERSION                                  |    2 +-
-# dist.mk                                  |    4 ++--
-# package/debian-mingw/changelog           |    4 ++--
-# package/debian-mingw64/changelog         |    4 ++--
-# package/debian/changelog                 |    4 ++--
-# package/mingw-ncurses.nsi                |    4 ++--
-# package/mingw-ncurses.spec               |    6 +++---
-# package/ncurses.spec                     |   12 ++++++++++--
-# package/ncursest.spec                    |   12 ++++++++++--
-# test/package/mingw-ncurses-examples.spec |   12 ++++++++++--
-# test/package/ncurses-examples.spec       |   12 ++++++++++--
-# 14 files changed, 79 insertions(+), 27 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/package/AdaCurses-doc.spec
-Prereq:  1.6 
---- ncurses-6.1-20191116+/Ada95/package/AdaCurses-doc.spec	2019-09-07 20:37:52.000000000 +0000
-+++ ncurses-6.1-20191123/Ada95/package/AdaCurses-doc.spec	2019-11-23 21:15:53.000000000 +0000
-@@ -3,7 +3,7 @@
- %define AppVersion MAJOR.MINOR
- %define AppRelease YYYYMMDD
- %define AppPackage %{AppProgram}-doc
--# $Id: AdaCurses-doc.spec,v 1.6 2019/09/07 20:37:52 tom Exp $
-+# $Id: AdaCurses-doc.spec,v 1.7 2019/11/23 21:15:53 tom Exp $
- Name: %{AppPackage}
- Version: %{AppVersion}
- Release: %{AppRelease}
-@@ -37,7 +37,12 @@
- (cd doc && make install.html DESTDIR=$RPM_BUILD_ROOT )
- 
- %clean
--[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-+if rm -rf $RPM_BUILD_ROOT; then
-+  echo OK
-+else
-+  find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
-+fi
-+exit 0
- 
- %files
- %defattr(-,root,root)
-@@ -46,6 +51,9 @@
- %changelog
- # each patch should add its ChangeLog entries here
- 
-+* Sat Nov 16 2019 Thomas Dickey
-+- modify clean-rule to work around Fedora NFS bugs.
-+
- * Sat Sep 07 2019 Thomas Dickey
- - use AppProgram to replace "AdaCurses" globally
- 
-Index: Ada95/package/AdaCurses.spec
-Prereq:  1.24 
---- ncurses-6.1-20191116+/Ada95/package/AdaCurses.spec	2019-09-15 00:07:32.000000000 +0000
-+++ ncurses-6.1-20191123/Ada95/package/AdaCurses.spec	2019-11-23 21:15:31.000000000 +0000
-@@ -2,7 +2,7 @@
- %define AppProgram AdaCurses
- %define AppVersion MAJOR.MINOR
- %define AppRelease YYYYMMDD
--# $Id: AdaCurses.spec,v 1.24 2019/09/15 00:07:32 tom Exp $
-+# $Id: AdaCurses.spec,v 1.25 2019/11/23 21:15:31 tom Exp $
- Name: %{AppProgram}
- Version: %{AppVersion}
- Release: %{AppRelease}
-@@ -65,7 +65,12 @@
- )
- 
- %clean
--[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-+if rm -rf $RPM_BUILD_ROOT; then
-+  echo OK
-+else
-+  find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
-+fi
-+exit 0
- 
- %files
- %defattr(-,root,root)
-@@ -82,6 +87,9 @@
- %changelog
- # each patch should add its ChangeLog entries here
- 
-+* Sat Nov 16 2019 Thomas Dickey
-+- modify clean-rule to work around Fedora NFS bugs.
-+
- * Sat Sep 14 2019 Thomas Dickey
- - build-fixes for Fedora29, OpenSUSE
- 
-Index: NEWS
-Prereq:  1.3407 
---- ncurses-6.1-20191116+/NEWS	2019-11-16 20:48:27.000000000 +0000
-+++ ncurses-6.1-20191123/NEWS	2019-11-24 01:55:57.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3407 2019/11/16 20:48:27 tom Exp $
-+-- $Id: NEWS,v 1.3410 2019/11/24 01:55:57 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,10 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191123
-+	+ fix typo for MinGW rpm test-package.
-+	+ workaround in rpm specs for NFS problems in Fedora 31.
-+
- 20191116
- 	+ modify ncurses/Makefile.in to fix a case where Debian/testing changes
- 	  to the ld --as-needed configuration broke ncurses-examples test
-Index: VERSION
---- ncurses-6.1-20191116+/VERSION	2019-11-16 15:09:15.000000000 +0000
-+++ ncurses-6.1-20191123/VERSION	2019-11-23 15:45:17.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191116
-+5:0:10	6.1	20191123
-Index: dist.mk
-Prereq:  1.1315 
---- ncurses-6.1-20191116+/dist.mk	2019-11-16 15:09:15.000000000 +0000
-+++ ncurses-6.1-20191123/dist.mk	2019-11-23 15:45:17.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1315 2019/11/16 15:09:15 tom Exp $
-+# $Id: dist.mk,v 1.1316 2019/11/23 15:45:17 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191116
-+NCURSES_PATCH = 20191123
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20191116+/package/debian-mingw/changelog	2019-11-16 15:09:15.000000000 +0000
-+++ ncurses-6.1-20191123/package/debian-mingw/changelog	2019-11-23 15:45:17.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191116) unstable; urgency=low
-+ncurses6 (6.1+20191123) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 16 Nov 2019 10:09:15 -0500
-+ -- Thomas E. Dickey   Sat, 23 Nov 2019 10:45:17 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20191116+/package/debian-mingw64/changelog	2019-11-16 15:09:15.000000000 +0000
-+++ ncurses-6.1-20191123/package/debian-mingw64/changelog	2019-11-23 15:45:17.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191116) unstable; urgency=low
-+ncurses6 (6.1+20191123) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 16 Nov 2019 10:09:15 -0500
-+ -- Thomas E. Dickey   Sat, 23 Nov 2019 10:45:17 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20191116+/package/debian/changelog	2019-11-16 15:09:15.000000000 +0000
-+++ ncurses-6.1-20191123/package/debian/changelog	2019-11-23 15:45:17.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191116) unstable; urgency=low
-+ncurses6 (6.1+20191123) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 16 Nov 2019 10:09:15 -0500
-+ -- Thomas E. Dickey   Sat, 23 Nov 2019 10:45:17 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.361 
---- ncurses-6.1-20191116+/package/mingw-ncurses.nsi	2019-11-16 15:09:15.000000000 +0000
-+++ ncurses-6.1-20191123/package/mingw-ncurses.nsi	2019-11-23 15:45:17.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.361 2019/11/16 15:09:15 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.362 2019/11/23 15:45:17 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "1116"
-+!define VERSION_MMDD  "1123"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20191116+/package/mingw-ncurses.spec	2019-11-16 15:09:15.000000000 +0000
-+++ ncurses-6.1-20191123/package/mingw-ncurses.spec	2019-11-24 01:54:24.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20191116
-+Release: 20191123
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-@@ -68,8 +68,8 @@
- 	--with-cxx-shared \\\
- 	--with-develop \\\
- 	--with-fallbacks=unknown,xterm \\\
--	--with-tic-path=/usr/bin/tic${MY_ABI} \\\
--	--with-infocmp-path=/usr/bin/infocmp${MY_ABI} \\\
-+	--with-tic-path=/usr/bin/tic%{MY_ABI} \\\
-+	--with-infocmp-path=/usr/bin/infocmp%{MY_ABI} \\\
- 	--with-install-prefix=$RPM_BUILD_ROOT \\\
- 	--with-pc-suffix=%{MY_ABI} \\\
- 	--with-pcre2 \\\
-Index: package/ncurses.spec
---- ncurses-6.1-20191116+/package/ncurses.spec	2019-11-16 15:09:15.000000000 +0000
-+++ ncurses-6.1-20191123/package/ncurses.spec	2019-11-23 21:14:34.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20191116
-+Release: 20191123
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-@@ -114,7 +114,12 @@
- ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} )
- 
- %clean
--rm -rf $RPM_BUILD_ROOT
-+if rm -rf $RPM_BUILD_ROOT; then
-+  echo OK
-+else
-+  find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
-+fi
-+exit 0
- 
- %files
- %defattr(-,root,root,-)
-@@ -124,6 +129,9 @@
- 
- %changelog
- 
-+* Sat Nov 16 2019 Thomas Dickey
-+- modify clean-rule to work around Fedora NFS bugs.
-+
- * Sat Aug 25 2018 Thomas E. Dickey
- - split spec-file into ncurses6 and ncursest6 to work around toolset breakage
-   in Fedora 28
-Index: package/ncursest.spec
---- ncurses-6.1-20191116+/package/ncursest.spec	2019-11-16 15:09:15.000000000 +0000
-+++ ncurses-6.1-20191123/package/ncursest.spec	2019-11-23 21:14:52.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20191116
-+Release: 20191123
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-@@ -118,7 +118,12 @@
- ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncursest%{MY_ABI} )
- 
- %clean
--rm -rf $RPM_BUILD_ROOT
-+if rm -rf $RPM_BUILD_ROOT; then
-+  echo OK
-+else
-+  find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
-+fi
-+exit 0
- 
- %files
- %defattr(-,root,root,-)
-@@ -128,6 +133,9 @@
- 
- %changelog
- 
-+* Sat Nov 16 2019 Thomas Dickey
-+- modify clean-rule to work around Fedora NFS bugs.
-+
- * Sat Aug 25 2018 Thomas E. Dickey
- - split spec-file into ncurses6 and ncursest6 to work around toolset breakage
-   in Fedora 28
-Index: test/package/mingw-ncurses-examples.spec
-Prereq:  1.8 
---- ncurses-6.1-20191116+/test/package/mingw-ncurses-examples.spec	2019-01-27 00:22:16.000000000 +0000
-+++ ncurses-6.1-20191123/test/package/mingw-ncurses-examples.spec	2019-11-23 21:13:52.000000000 +0000
-@@ -4,7 +4,7 @@
- %global AppProgram ncurses-examples
- %global AppVersion MAJOR.MINOR
- %global AppRelease YYYYMMDD
--# $Id: mingw-ncurses-examples.spec,v 1.8 2019/01/27 00:22:16 tom Exp $
-+# $Id: mingw-ncurses-examples.spec,v 1.9 2019/11/23 21:13:52 tom Exp $
- Name: mingw32-ncurses6-examples
- Version: %{AppVersion}
- Release: %{AppRelease}
-@@ -97,7 +97,12 @@
- popd
- 
- %clean
--rm -rf $RPM_BUILD_ROOT
-+if rm -rf $RPM_BUILD_ROOT; then
-+  echo OK
-+else
-+  find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
-+fi
-+exit 0
- 
- %defattr(-,root,root,-)
- 
-@@ -111,5 +116,8 @@
- 
- %changelog
- 
-+* Sat Nov 16 2019 Thomas Dickey
-+- modify clean-rule to work around Fedora NFS bugs.
-+
- * Sat Oct 19 2013 Thomas E. Dickey
- - initial version
-Index: test/package/ncurses-examples.spec
-Prereq:  1.14 
---- ncurses-6.1-20191116+/test/package/ncurses-examples.spec	2019-02-03 01:17:27.000000000 +0000
-+++ ncurses-6.1-20191123/test/package/ncurses-examples.spec	2019-11-23 21:11:34.000000000 +0000
-@@ -3,7 +3,7 @@
- %global AltProgram ncursest-examples
- %global AppVersion MAJOR.MINOR
- %global AppRelease YYYYMMDD
--# $Id: ncurses-examples.spec,v 1.14 2019/02/03 01:17:27 tom Exp $
-+# $Id: ncurses-examples.spec,v 1.16 2019/11/23 21:11:34 tom Exp $
- Name: %{AppProgram}
- Version: %{AppVersion}
- Release: %{AppRelease}
-@@ -86,7 +86,12 @@
- popd
- 
- %clean
--[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-+if rm -rf $RPM_BUILD_ROOT; then
-+  echo OK
-+else
-+  find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
-+fi
-+exit 0
- 
- %files -n %{AppProgram}
- %defattr(-,root,root)
-@@ -101,6 +106,9 @@
- %changelog
- # each patch should add its ChangeLog entries here
- 
-+* Sat Nov 16 2019 Thomas Dickey
-+- modify clean-rule to work around Fedora NFS bugs.
-+
- * Sat Nov 11 2017 Thomas Dickey
- - add example data-files
- - use rpm built-in "configure"
diff --git a/ncurses-6.1-20191130.patch b/ncurses-6.1-20191130.patch
deleted file mode 100644
index 046adf4..0000000
--- a/ncurses-6.1-20191130.patch
+++ /dev/null
@@ -1,3764 +0,0 @@
-# ncurses 6.1 - patch 20191130 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191130.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Dec  1 01:27:53 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                                       |    9 
-# VERSION                                    |    2 
-# dist.mk                                    |    4 
-# doc/html/man/adacurses6-config.1.html      |    2 
-# doc/html/man/captoinfo.1m.html             |    2 
-# doc/html/man/clear.1.html                  |    2 
-# doc/html/man/curs_add_wchstr.3x.html       |    4 
-# doc/html/man/curs_addch.3x.html            |   38 +-
-# doc/html/man/curs_addchstr.3x.html         |    4 
-# doc/html/man/curs_addstr.3x.html           |    4 
-# doc/html/man/curs_addwstr.3x.html          |    4 
-# doc/html/man/curs_attr.3x.html             |    4 
-# doc/html/man/curs_border.3x.html           |    4 
-# doc/html/man/curs_border_set.3x.html       |    4 
-# doc/html/man/curs_delch.3x.html            |    4 
-# doc/html/man/curs_get_wch.3x.html          |    4 
-# doc/html/man/curs_get_wstr.3x.html         |    2 
-# doc/html/man/curs_getcchar.3x.html         |   50 ++-
-# doc/html/man/curs_getch.3x.html            |    4 
-# doc/html/man/curs_in_wch.3x.html           |    4 
-# doc/html/man/curs_in_wchstr.3x.html        |    4 
-# doc/html/man/curs_inch.3x.html             |    4 
-# doc/html/man/curs_ins_wch.3x.html          |    4 
-# doc/html/man/curs_ins_wstr.3x.html         |    4 
-# doc/html/man/curs_insch.3x.html            |    4 
-# doc/html/man/curs_insstr.3x.html           |    4 
-# doc/html/man/curs_inwstr.3x.html           |    4 
-# doc/html/man/curs_kernel.3x.html           |    4 
-# doc/html/man/curs_printw.3x.html           |    4 
-# doc/html/man/curs_refresh.3x.html          |    4 
-# doc/html/man/curs_scanw.3x.html            |    4 
-# doc/html/man/curs_scr_dump.3x.html         |    4 
-# doc/html/man/curs_scroll.3x.html           |    4 
-# doc/html/man/curs_sp_funcs.3x.html         |    2 
-# doc/html/man/curs_termcap.3x.html          |    2 
-# doc/html/man/curs_util.3x.html             |    2 
-# doc/html/man/default_colors.3x.html        |    4 
-# doc/html/man/form.3x.html                  |    4 
-# doc/html/man/form_field_attributes.3x.html |    2 
-# doc/html/man/form_field_buffer.3x.html     |    2 
-# doc/html/man/form_field_info.3x.html       |    2 
-# doc/html/man/form_field_just.3x.html       |    2 
-# doc/html/man/form_new_page.3x.html         |    4 
-# doc/html/man/infocmp.1m.html               |    2 
-# doc/html/man/infotocap.1m.html             |    2 
-# doc/html/man/menu.3x.html                  |    2 
-# doc/html/man/menu_attributes.3x.html       |    2 
-# doc/html/man/ncurses.3x.html               |  447 +++++++++++++--------------
-# doc/html/man/ncurses6-config.1.html        |    2 
-# doc/html/man/panel.3x.html                 |    2 
-# doc/html/man/tabs.1.html                   |    2 
-# doc/html/man/term_variables.3x.html        |    2 
-# doc/html/man/terminfo.5.html               |    4 
-# doc/html/man/tic.1m.html                   |    4 
-# doc/html/man/toe.1m.html                   |    2 
-# doc/html/man/tput.1.html                   |    2 
-# doc/html/man/tset.1.html                   |    2 
-# man/curs_add_wchstr.3x                     |   10 
-# man/curs_addch.3x                          |   29 +
-# man/curs_addchstr.3x                       |   10 
-# man/curs_addstr.3x                         |   10 
-# man/curs_addwstr.3x                        |   10 
-# man/curs_attr.3x                           |   10 
-# man/curs_border.3x                         |   10 
-# man/curs_border_set.3x                     |   10 
-# man/curs_delch.3x                          |   10 
-# man/curs_get_wch.3x                        |   10 
-# man/curs_get_wstr.3x                       |    8 
-# man/curs_getcchar.3x                       |   49 ++
-# man/curs_getch.3x                          |   18 -
-# man/curs_in_wch.3x                         |   10 
-# man/curs_in_wchstr.3x                      |   10 
-# man/curs_inch.3x                           |   10 
-# man/curs_ins_wch.3x                        |   10 
-# man/curs_ins_wstr.3x                       |   10 
-# man/curs_insch.3x                          |   10 
-# man/curs_insstr.3x                         |   10 
-# man/curs_inwstr.3x                         |   10 
-# man/curs_kernel.3x                         |    8 
-# man/curs_printw.3x                         |   10 
-# man/curs_refresh.3x                        |    7 
-# man/curs_scanw.3x                          |   10 
-# man/curs_scr_dump.3x                       |   10 
-# man/curs_scroll.3x                         |   12 
-# man/curs_sp_funcs.3x                       |    8 
-# man/curs_termcap.3x                        |    8 
-# man/curs_util.3x                           |    8 
-# man/default_colors.3x                      |   12 
-# man/form.3x                                |    4 
-# man/form_field_attributes.3x               |    8 
-# man/form_field_buffer.3x                   |    8 
-# man/form_field_info.3x                     |    8 
-# man/form_field_just.3x                     |    8 
-# man/form_new_page.3x                       |   10 
-# man/menu_attributes.3x                     |    8 
-# man/ncurses.3x                             |   41 +-
-# man/term_variables.3x                      |    6 
-# man/terminfo.tail                          |   18 -
-# man/tic.1m                                 |    6 
-# package/debian-mingw/changelog             |    4 
-# package/debian-mingw64/changelog           |    4 
-# package/debian/changelog                   |    4 
-# package/mingw-ncurses.nsi                  |    4 
-# package/mingw-ncurses.spec                 |    2 
-# package/ncurses.spec                       |    2 
-# package/ncursest.spec                      |    2 
-# 106 files changed, 754 insertions(+), 470 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3410 
---- ncurses-6.1-20191123+/NEWS	2019-11-24 01:55:57.000000000 +0000
-+++ ncurses-6.1-20191130/NEWS	2019-11-30 22:27:28.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3410 2019/11/24 01:55:57 tom Exp $
-+-- $Id: NEWS,v 1.3412 2019/11/30 22:27:28 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,13 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191130
-+	+ add portability section to curs_getcchar manpage (prompted by
-+	  discussion with Nick Black).
-+	+ improve portability discussion of ACS characters in curs_addch
-+	  manpage.
-+	+ improve typography for double-quotes in manpages.
-+
- 20191123
- 	+ fix typo for MinGW rpm test-package.
- 	+ workaround in rpm specs for NFS problems in Fedora 31.
-Index: VERSION
---- ncurses-6.1-20191123+/VERSION	2019-11-23 15:45:17.000000000 +0000
-+++ ncurses-6.1-20191130/VERSION	2019-11-30 14:52:31.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191123
-+5:0:10	6.1	20191130
-Index: dist.mk
-Prereq:  1.1316 
---- ncurses-6.1-20191123+/dist.mk	2019-11-23 15:45:17.000000000 +0000
-+++ ncurses-6.1-20191130/dist.mk	2019-11-30 14:52:31.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1316 2019/11/23 15:45:17 tom Exp $
-+# $Id: dist.mk,v 1.1317 2019/11/30 14:52:31 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191123
-+NCURSES_PATCH = 20191130
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/adacurses6-config.1.html
---- ncurses-6.1-20191123+/doc/html/man/adacurses6-config.1.html	2019-10-27 00:15:46.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/adacurses6-config.1.html	2019-11-30 22:44:57.000000000 +0000
-@@ -125,7 +125,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20191123+/doc/html/man/captoinfo.1m.html	2019-10-27 00:15:46.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/captoinfo.1m.html	2019-11-30 22:44:57.000000000 +0000
-@@ -198,7 +198,7 @@
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/clear.1.html
---- ncurses-6.1-20191123+/doc/html/man/clear.1.html	2019-10-27 00:15:46.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/clear.1.html	2019-11-30 22:44:57.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
- 
-Index: doc/html/man/curs_add_wchstr.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_add_wchstr.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_add_wchstr.3x.html	2019-11-30 22:44:57.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_addch.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_addch.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_addch.3x.html	2019-11-30 22:44:57.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_addch.3x,v 1.47 2019/02/16 23:50:17 tom Exp @
-+  * @Id: curs_addch.3x,v 1.50 2019/11/30 20:07:00 tom Exp @
- -->
- 
- 
-@@ -186,7 +186,31 @@
-

    ACS Symbols

    -        X/Open Curses states that the ACS_ definitions are char constants.  For
-        the wide-character implementation (see curs_add_wch), there are  analo-
--       gous WACS_ definitions which are cchar_t constants.
-+       gous  WACS_  definitions which are cchar_t constants.  Some implementa-
-+       tions are problematic:
-+
-+       o   Some implementations define the ACS symbols to a constant (such  as
-+           Solaris), while others define those to entries in an array.
-+
-+           This  implementation uses an array acs_map, as done in SVr4 curses.
-+           NetBSD also uses an array, actually named _acs_char, with a #define
-+           for compatibility.
-+
-+       o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
-+           symbols as if the ACS_ symbols were wide  characters.   The  misde-
-+           fined  symbols  are the arrows and other symbols which are not used
-+           for line-drawing.
-+
-+       o   X/Open Curses (issues 2 through 7) has a  typographical  error  for
-+           the ACS_LANTERN symbol, equating its "VT100+ Character" to I (capi-
-+           tal I), while the header files for  SVr4  curses  and  the  various
-+           implementations use i (lowercase).
-+
-+           None  of the terminal descriptions on Unix platforms use uppercase-
-+           I, except for Solaris (i.e., screen's terminal description,  appar-
-+           ently based on the X/Open documentation around 1995).  On the other
-+           hand, the terminal description gs6300 (AT&T PC6300 with EMOTS  Ter-
-+           minal Emulator) uses lowercase-i.
- 
-        Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
-        ACS_NEQUAL, ACS_STERLING) were not documented in any publicly  released
-@@ -217,11 +241,11 @@
-        acter information (attributes and color) was separated from the charac-
-        ter information which is packed in a chtype to pass to waddch.
- 
--       In this implementation, chtype holds eight bits.   But  ncurses  allows
--       multibyte  characters  to be passed in a succession of calls to waddch.
--       The other implementations do not do  this;  a  call  to  waddch  passes
--       exactly one character which may be rendered as one or more cells on the
--       screen depending on whether it is printable.
-+       In this implementation,  chtype  holds  an  eight-bit  character.   But
-+       ncurses  allows  multibyte  characters  to be passed in a succession of
-+       calls to waddch.  The other implementations do not do this; a  call  to
-+       waddch  passes  exactly  one  character which may be rendered as one or
-+       more cells on the screen depending on whether it is printable.
- 
-        Depending on the locale settings, ncurses will inspect the byte  passed
-        in  each  call  to waddch, and check if the latest call will continue a
-Index: doc/html/man/curs_addchstr.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_addchstr.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_addchstr.3x.html	2019-11-30 22:44:57.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_addstr.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_addstr.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_addstr.3x.html	2019-11-30 22:44:57.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_addwstr.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_addwstr.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_addwstr.3x.html	2019-11-30 22:44:57.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_attr.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_attr.3x.html	2019-11-30 22:44:57.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-Index: doc/html/man/curs_border_set.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_border_set.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_border_set.3x.html	2019-11-30 22:44:57.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_delch.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_delch.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_delch.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_get_wch.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_get_wch.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_get_wch.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_get_wstr.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_get_wstr.3x.html	2019-07-20 19:16:42.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_get_wstr.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_get_wstr.3x,v 1.18 2019/07/20 19:14:56 tom Exp @
-+  * @Id: curs_get_wstr.3x,v 1.19 2019/11/30 20:59:22 tom Exp @
- -->
- 
- 
-Index: doc/html/man/curs_getcchar.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_getcchar.3x.html	2019-05-18 23:58:24.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_getcchar.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_getcchar.3x,v 1.21 2019/03/24 00:59:45 tom Exp @
-+  * @Id: curs_getcchar.3x,v 1.23 2019/11/30 22:22:32 tom Exp @
- -->
- 
- 
-@@ -143,6 +143,53 @@
-        ERR.
- 
- 
-+

    PORTABILITY

    -+       The  CCHARW_MAX  symbol is specific to ncurses.  X/Open Curses does not
-+       provide details for the layout of the cchar_t structure.  It tells what
-+       data are stored in it:
-+
-+       o   a spacing character (wchar_t, i.e., 32-bits).
-+
-+       o   non-spacing characters (again, wchar_t's).
-+
-+       o   attributes  (at  least  16 bits, inferred from the various ACS- and
-+           WACS-flags).
-+
-+       o   color pair (at least 16 bits,  inferred  from  the  unsigned  short
-+           type).
-+
-+       The non-spacing characters are optional, in the sense that zero or more
-+       may be stored in a cchar_t.  XOpen/Curses specifies a limit:
-+
-+           Implementations may limit the number of non-spacing characters that
-+           can  be  associated with a spacing character, provided any limit is
-+           at least 5.
-+
-+       The Unix implementations at the time follow that limit:
-+
-+       o   AIX 4 and OSF1 4 use the same declaration with an array of  5  non-
-+           spacing characters z and a single spacing character c.
-+
-+       o   HP-UX 10  uses  an  opaque  structure with 28 bytes, which is large
-+           enough for the 6 wchar_t values.
-+
-+       o   Solaris xpg4 curses uses a single array of 6 wchar_t values.
-+
-+       This implementation's cchar_t was defined in 1995 using 5 for the total
-+       of  spacing and non-spacing characters (CCHARW_MAX).  That was probably
-+       due to a misreading of the  AIX 4  header  files,  because  the  X/Open
-+       Curses  document  was  not generally available at that time.  Later (in
-+       2002), this detail was overlooked when beginning to implement the func-
-+       tions using the structure.
-+
-+       In  practice, even four non-spacing characters may seem enough.  X/Open
-+       Curses documents possible uses for  non-spacing  characters,  including
-+       using  them  for ligatures between characters (a feature apparently not
-+       supported by any curses implementation).  Unicode does  not  limit  the
-+       (analogous) number of combining characters, so some applications may be
-+       affected.
-+
-+
-

    SEE ALSO

    -        Functions: curs_attr(3x), curs_color(3x), curses(3x), wcwidth(3).
- 
-@@ -163,6 +210,7 @@
- 
  • EXTENSIONS
    • 
- 
  • NOTES
    • 
- 
  • RETURN VALUE
    • 
-+
  • PORTABILITY
    • 
- 
  • SEE ALSO
    • 
- 
- 
-Index: doc/html/man/curs_getch.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_getch.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_getch.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-Index: doc/html/man/curs_in_wch.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_in_wch.3x.html	2019-03-16 19:34:43.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_in_wch.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_in_wchstr.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_in_wchstr.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_in_wchstr.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_inch.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_inch.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_inch.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-Index: doc/html/man/curs_ins_wch.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_ins_wch.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_ins_wch.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_ins_wstr.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_ins_wstr.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_ins_wstr.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_insch.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_insch.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_insch.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_insstr.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_insstr.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_insstr.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_inwstr.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_inwstr.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_inwstr.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_kernel.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_kernel.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_kernel.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_printw.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_printw.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_printw.3x.html	2019-11-30 22:44:58.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_refresh.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_refresh.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_refresh.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_scanw.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_scanw.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_scanw.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_scr_dump.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_scr_dump.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_scr_dump.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_scroll.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_scroll.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_scroll.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_sp_funcs.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_sp_funcs.3x.html	2019-05-18 23:58:25.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_sp_funcs.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_sp_funcs.3x,v 1.16 2019/04/13 16:41:08 tom Exp @
-+  * @Id: curs_sp_funcs.3x,v 1.17 2019/11/30 21:01:26 tom Exp @
-   * ***************************************************************************
-   * ***************************************************************************
-   * ***************************************************************************
-Index: doc/html/man/curs_termcap.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_termcap.3x.html	2019-03-23 22:00:05.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_termcap.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_termcap.3x,v 1.41 2019/03/23 21:51:12 tom Exp @
-+  * @Id: curs_termcap.3x,v 1.42 2019/11/30 21:01:40 tom Exp @
- -->
- 
- 
-Index: doc/html/man/curs_util.3x.html
---- ncurses-6.1-20191123+/doc/html/man/curs_util.3x.html	2019-03-23 22:00:05.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/curs_util.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_util.3x,v 1.55 2019/03/23 21:51:12 tom Exp @
-+  * @Id: curs_util.3x,v 1.56 2019/11/30 21:04:02 tom Exp @
- -->
- 
- 
-Index: doc/html/man/default_colors.3x.html
---- ncurses-6.1-20191123+/doc/html/man/default_colors.3x.html	2019-03-16 19:34:45.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/default_colors.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.1-20191123+/doc/html/man/form.3x.html	2019-10-27 00:15:49.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/form.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form.3x,v 1.32 2019/01/20 20:31:42 tom Exp @
-+  * @Id: form.3x,v 1.33 2019/11/30 20:51:36 tom Exp @
- -->
- 
- 
-@@ -246,7 +246,7 @@
-        curses(3x)  and  related  pages  whose names begin "form_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
- 
-Index: doc/html/man/form_field_attributes.3x.html
---- ncurses-6.1-20191123+/doc/html/man/form_field_attributes.3x.html	2019-03-16 19:34:45.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/form_field_attributes.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_field_attributes.3x,v 1.14 2019/01/20 20:31:42 tom Exp @
-+  * @Id: form_field_attributes.3x,v 1.15 2019/11/30 21:01:57 tom Exp @
- -->
- 
- 
-Index: doc/html/man/form_field_buffer.3x.html
---- ncurses-6.1-20191123+/doc/html/man/form_field_buffer.3x.html	2019-03-16 19:34:45.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/form_field_buffer.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_field_buffer.3x,v 1.23 2019/01/20 20:19:03 tom Exp @
-+  * @Id: form_field_buffer.3x,v 1.24 2019/11/30 21:02:22 tom Exp @
- -->
- 
- 
-Index: doc/html/man/form_field_info.3x.html
---- ncurses-6.1-20191123+/doc/html/man/form_field_info.3x.html	2019-03-16 19:34:45.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/form_field_info.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_field_info.3x,v 1.15 2019/01/20 20:31:42 tom Exp @
-+  * @Id: form_field_info.3x,v 1.16 2019/11/30 21:02:29 tom Exp @
- -->
- 
- 
-Index: doc/html/man/form_field_just.3x.html
---- ncurses-6.1-20191123+/doc/html/man/form_field_just.3x.html	2019-03-16 19:34:45.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/form_field_just.3x.html	2019-11-30 22:44:59.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_field_just.3x,v 1.14 2019/01/20 20:31:42 tom Exp @
-+  * @Id: form_field_just.3x,v 1.15 2019/11/30 21:02:36 tom Exp @
- -->
- 
- 
-Index: doc/html/man/form_new_page.3x.html
---- ncurses-6.1-20191123+/doc/html/man/form_new_page.3x.html	2019-03-16 19:34:45.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/form_new_page.3x.html	2019-11-30 22:45:00.000000000 +0000
-@@ -1,7 +1,7 @@
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.1-20191123+/doc/html/man/infocmp.1m.html	2019-10-27 00:15:50.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/infocmp.1m.html	2019-11-30 22:45:00.000000000 +0000
-@@ -512,7 +512,7 @@
- 
-        https://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/infotocap.1m.html
---- ncurses-6.1-20191123+/doc/html/man/infotocap.1m.html	2019-10-27 00:15:50.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/infotocap.1m.html	2019-11-30 22:45:00.000000000 +0000
-@@ -90,7 +90,7 @@
-

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/menu.3x.html
---- ncurses-6.1-20191123+/doc/html/man/menu.3x.html	2019-10-27 00:15:50.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/menu.3x.html	2019-11-30 22:45:00.000000000 +0000
-@@ -221,7 +221,7 @@
-        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
- 
-Index: doc/html/man/menu_attributes.3x.html
---- ncurses-6.1-20191123+/doc/html/man/menu_attributes.3x.html	2019-03-16 19:34:46.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/menu_attributes.3x.html	2019-11-30 22:45:00.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: menu_attributes.3x,v 1.15 2019/01/20 20:32:23 tom Exp @
-+  * @Id: menu_attributes.3x,v 1.16 2019/11/30 21:02:51 tom Exp @
- -->
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.1-20191123+/doc/html/man/ncurses.3x.html	2019-10-27 00:15:51.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/ncurses.3x.html	2019-11-30 22:45:01.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: ncurses.3x,v 1.141 2019/02/16 15:07:20 tom Exp @
-+  * @Id: ncurses.3x,v 1.143 2019/11/30 20:47:07 tom Exp @
- -->
- 
- 
-@@ -59,7 +59,7 @@
-        method of updating  character  screens  with  reasonable  optimization.
-        This  implementation  is  "new  curses"  (ncurses)  and is the approved
-        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
-        The  ncurses  library emulates the curses library of System V Release 4
-        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-@@ -258,24 +258,27 @@
-                     Each cell (row and column) in a  WINDOW  is  stored  as  a
-                     cchar_t.
- 
-+                    The  setcchar(3x)  and  getcchar(3x)  functions  store and
-+                    retrieve the data from a cchar_t structure.
-+
-                wchar_t
--                    stores  a  "wide"  character.  Like chtype, this may be an
-+                    stores a "wide" character.  Like chtype, this  may  be  an
-                     integer.
- 
-                wint_t
--                    stores a wchar_t or WEOF - not the same, though  both  may
-+                    stores  a  wchar_t or WEOF - not the same, though both may
-                     have the same size.
- 
--               The  "wide"  library provides new functions which are analogous
--               to functions in the "normal" library.  There is a  naming  con-
--               vention  which relates many of the normal/wide variants: a "_w"
-+               The "wide" library provides new functions which  are  analogous
-+               to  functions  in the "normal" library.  There is a naming con-
-+               vention which relates many of the normal/wide variants: a  "_w"
-                is  inserted  into  the  name.   For  example,  waddch  becomes
-                wadd_wch.
- 
- 
-

    Routine Name Index

    --       The  following table lists each curses routine and the name of the man-
--       ual page on which it is  described.   Routines  flagged  with  "*"  are
-+       The following table lists each curses routine and the name of the  man-
-+       ual  page  on  which  it  is  described.  Routines flagged with "*" are
-        ncurses-specific, not described by XPG4 or present in SVr4.
- 
-                     curses Routine Name      Manual Page Name
-@@ -309,10 +312,10 @@
-                     attr_off                 curs_attr(3x)
-                     attr_on                  curs_attr(3x)
-                     attr_set                 curs_attr(3x)
-+
-                     attroff                  curs_attr(3x)
-                     attron                   curs_attr(3x)
-                     attrset                  curs_attr(3x)
--
-                     baudrate                 curs_termattrs(3x)
-                     beep                     curs_beep(3x)
-                     bkgd                     curs_bkgd(3x)
-@@ -375,10 +378,10 @@
-                     getcurx                  curs_legacy(3x)*
-                     getcury                  curs_legacy(3x)*
-                     getmaxx                  curs_legacy(3x)*
-+
-                     getmaxy                  curs_legacy(3x)*
-                     getmaxyx                 curs_getyx(3x)
-                     getmouse                 curs_mouse(3x)*
--
-                     getn_wstr                curs_get_wstr(3x)
-                     getnstr                  curs_getstr(3x)
-                     getparx                  curs_legacy(3x)*
-@@ -441,10 +444,10 @@
-                     key_defined              key_defined(3x)*
-                     key_name                 curs_util(3x)
-                     keybound                 keybound(3x)*
-+
-                     keyname                  curs_util(3x)
-                     keyok                    keyok(3x)*
-                     keypad                   curs_inopts(3x)
--
-                     killchar                 curs_termattrs(3x)
-                     killwchar                curs_termattrs(3x)
-                     leaveok                  curs_outopts(3x)
-@@ -507,10 +510,10 @@
-                     mvwaddnwstr              curs_addwstr(3x)
-                     mvwaddstr                curs_addstr(3x)
-                     mvwaddwstr               curs_addwstr(3x)
-+
-                     mvwchgat                 curs_attr(3x)
-                     mvwdelch                 curs_delch(3x)
-                     mvwget_wch               curs_get_wch(3x)
--
-                     mvwget_wstr              curs_get_wstr(3x)
-                     mvwgetch                 curs_getch(3x)
-                     mvwgetn_wstr             curs_get_wstr(3x)
-@@ -573,10 +576,10 @@
-                     restartterm              curs_terminfo(3x)
-                     ripoffline               curs_kernel(3x)
-                     savetty                  curs_kernel(3x)
-+
-                     scanw                    curs_scanw(3x)
-                     scr_dump                 curs_scr_dump(3x)
-                     scr_init                 curs_scr_dump(3x)
--
-                     scr_restore              curs_scr_dump(3x)
-                     scr_set                  curs_scr_dump(3x)
-                     scrl                     curs_scroll(3x)
-@@ -639,10 +642,10 @@
-                     use_default_colors       default_colors(3x)*
-                     use_env                  curs_util(3x)
-                     use_extended_names       curs_extend(3x)*
-+
-                     use_legacy_coding        legacy_coding(3x)*
-                     use_tioctl               curs_util(3x)*
-                     vid_attr                 curs_terminfo(3x)
--
-                     vid_puts                 curs_terminfo(3x)
-                     vidattr                  curs_terminfo(3x)
-                     vidputs                  curs_terminfo(3x)
-@@ -705,10 +708,10 @@
-                     winch                    curs_inch(3x)
-                     winchnstr                curs_inchstr(3x)
-                     winchstr                 curs_inchstr(3x)
-+
-                     winnstr                  curs_instr(3x)
-                     winnwstr                 curs_inwstr(3x)
-                     wins_nwstr               curs_ins_wstr(3x)
--
-                     wins_wch                 curs_ins_wch(3x)
-                     wins_wstr                curs_ins_wstr(3x)
-                     winsch                   curs_insch(3x)
-@@ -740,31 +743,31 @@
- 
- 
-

    RETURN VALUE

    --       Routines  that return an integer return ERR upon failure and an integer
-+       Routines that return an integer return ERR upon failure and an  integer
-        value other than ERR upon successful completion, unless otherwise noted
-        in the routine descriptions.
- 
--       As  a  general rule, routines check for null pointers passed as parame-
-+       As a general rule, routines check for null pointers passed  as  parame-
-        ters, and handle this as an error.
- 
--       All macros return  the  value  of  the  w  version,  except  setscrreg,
--       wsetscrreg,  getyx,  getbegyx,  and  getmaxyx.   The  return  values of
--       setscrreg, wsetscrreg, getyx,  getbegyx,  and  getmaxyx  are  undefined
--       (i.e.,  these  should  not be used as the right-hand side of assignment
-+       All  macros  return  the  value  of  the  w  version, except setscrreg,
-+       wsetscrreg, getyx,  getbegyx,  and  getmaxyx.   The  return  values  of
-+       setscrreg,  wsetscrreg,  getyx,  getbegyx,  and  getmaxyx are undefined
-+       (i.e., these should not be used as the right-hand  side  of  assignment
-        statements).
- 
-        Routines that return pointers return NULL on error.
- 
- 
-

    ENVIRONMENT

    --       The following environment symbols are useful for customizing  the  run-
--       time  behavior  of  the  ncurses library.  The most important ones have
-+       The  following  environment symbols are useful for customizing the run-
-+       time behavior of the ncurses library.  The  most  important  ones  have
-        been already discussed in detail.
- 
- 
-

    CC command-character

    --       When set, change occurrences of the command_character (i.e., the  cmdch
--       capability)  of  the loaded terminfo entries to the value of this vari-
-+       When  set, change occurrences of the command_character (i.e., the cmdch
-+       capability) of the loaded terminfo entries to the value of  this  vari-
-        able.  Very few terminfo entries provide this feature.
- 
-        Because this name is also used in development environments to represent
-@@ -773,34 +776,34 @@
- 
- 
-

    BAUDRATE

    --       The debugging library checks this environment variable when the  appli-
--       cation  has  redirected output to a file.  The variable's numeric value
--       is used for the baudrate.  If no value is  found,  ncurses  uses  9600.
--       This  allows  testers to construct repeatable test-cases that take into
-+       The  debugging library checks this environment variable when the appli-
-+       cation has redirected output to a file.  The variable's  numeric  value
-+       is  used  for  the  baudrate.  If no value is found, ncurses uses 9600.
-+       This allows testers to construct repeatable test-cases that  take  into
-        account costs that depend on baudrate.
- 
- 
-

    COLUMNS

    -        Specify the width of the screen in characters.  Applications running in
--       a  windowing  environment  usually  are able to obtain the width of the
--       window in which they are executing.  If neither the COLUMNS  value  nor
--       the  terminal's  screen  size is available, ncurses uses the size which
-+       a windowing environment usually are able to obtain  the  width  of  the
-+       window  in  which they are executing.  If neither the COLUMNS value nor
-+       the terminal's screen size is available, ncurses uses  the  size  which
-        may be specified in the terminfo database (i.e., the cols capability).
- 
--       It is important that your  application  use  a  correct  size  for  the
--       screen.   This  is  not always possible because your application may be
--       running on a host which does not honor NAWS (Negotiations About  Window
--       Size),  or  because  you are temporarily running as another user.  How-
--       ever, setting COLUMNS and/or LINES overrides the library's use  of  the
-+       It  is  important  that  your  application  use  a correct size for the
-+       screen.  This is not always possible because your  application  may  be
-+       running  on a host which does not honor NAWS (Negotiations About Window
-+       Size), or because you are temporarily running as  another  user.   How-
-+       ever,  setting  COLUMNS and/or LINES overrides the library's use of the
-        screen size obtained from the operating system.
- 
--       Either  COLUMNS  or LINES symbols may be specified independently.  This
--       is mainly useful to circumvent legacy misfeatures of terminal  descrip-
-+       Either COLUMNS or LINES symbols may be specified  independently.   This
-+       is  mainly useful to circumvent legacy misfeatures of terminal descrip-
-        tions, e.g., xterm which commonly specifies a 65 line screen.  For best
--       results, lines and cols should not be specified in a terminal  descrip-
-+       results,  lines and cols should not be specified in a terminal descrip-
-        tion for terminals which are run as emulations.
- 
--       Use  the  use_env  function  to disable all use of external environment
-+       Use the use_env function to disable all  use  of  external  environment
-        (but not including system calls) to determine the screen size.  Use the
-        use_tioctl function to update COLUMNS or LINES to match the screen size
-        obtained from system calls or the terminal database.
-@@ -808,31 +811,31 @@
- 
-

    ESCDELAY

    -        Specifies the total time, in milliseconds, for which ncurses will await
--       a  character  sequence,  e.g., a function key.  The default value, 1000
--       milliseconds, is enough for most uses.  However, it is made a  variable
-+       a character sequence, e.g., a function key.  The  default  value,  1000
-+       milliseconds,  is enough for most uses.  However, it is made a variable
-        to accommodate unusual applications.
- 
--       The  most common instance where you may wish to change this value is to
--       work with slow hosts, e.g., running on a network.  If the  host  cannot
--       read  characters rapidly enough, it will have the same effect as if the
--       terminal did not send characters  rapidly  enough.   The  library  will
-+       The most common instance where you may wish to change this value is  to
-+       work  with  slow hosts, e.g., running on a network.  If the host cannot
-+       read characters rapidly enough, it will have the same effect as if  the
-+       terminal  did  not  send  characters  rapidly enough.  The library will
-        still see a timeout.
- 
--       Note  that  xterm  mouse  events  are built up from character sequences
-+       Note that xterm mouse events are  built  up  from  character  sequences
-        received from the xterm.  If your application makes heavy use of multi-
--       ple-clicking,  you  may wish to lengthen this default value because the
--       timeout applies to the composed multi-click event as well as the  indi-
-+       ple-clicking, you may wish to lengthen this default value  because  the
-+       timeout  applies to the composed multi-click event as well as the indi-
-        vidual clicks.
- 
-        In addition to the environment variable, this implementation provides a
--       global variable with the same name.  Portable applications  should  not
--       rely  upon  the  presence  of  ESCDELAY in either form, but setting the
--       environment variable rather than the global variable  does  not  create
-+       global  variable  with the same name.  Portable applications should not
-+       rely upon the presence of ESCDELAY in  either  form,  but  setting  the
-+       environment  variable  rather  than the global variable does not create
-        problems when compiling an application.
- 
- 
-

    HOME

    --       Tells  ncurses where your home directory is.  That is where it may read
-+       Tells ncurses where your home directory is.  That is where it may  read
-        and write auxiliary terminal descriptions:
- 
-            $HOME/.termcap
-@@ -846,7 +849,7 @@
- 
-

    MOUSE_BUTTONS_123

    -        This applies only to the OS/2 EMX port.  It specifies the order of but-
--       tons on the mouse.  OS/2 numbers a 3-button mouse  inconsistently  from
-+       tons  on  the mouse.  OS/2 numbers a 3-button mouse inconsistently from
-        other platforms:
- 
-            1 = left
-@@ -859,32 +862,32 @@
- 
- 
-

    NCURSES_ASSUMED_COLORS

    --       Override  the compiled-in assumption that the terminal's default colors
--       are white-on-black (see default_colors(3x)).  You  may  set  the  fore-
--       ground  and  background  color values with this environment variable by
--       proving a 2-element list: foreground,background.  For example, to  tell
--       ncurses  to  not assume anything about the colors, set this to "-1,-1".
--       To make it green-on-black, set it to "2,0".  Any  positive  value  from
-+       Override the compiled-in assumption that the terminal's default  colors
-+       are  white-on-black  (see  default_colors(3x)).   You may set the fore-
-+       ground and background color values with this  environment  variable  by
-+       proving  a 2-element list: foreground,background.  For example, to tell
-+       ncurses to not assume anything about the colors, set this  to  "-1,-1".
-+       To  make  it  green-on-black, set it to "2,0".  Any positive value from
-        zero to the terminfo max_colors value is allowed.
- 
- 
-

    NCURSES_CONSOLE2

    -        This applies only to the MinGW port of ncurses.
- 
--       The  Console2 program's handling of the Microsoft Console API call Cre-
--       ateConsoleScreenBuffer is defective.  Applications which use this  will
--       hang.   However,  it is possible to simulate the action of this call by
--       mapping coordinates,  explicitly  saving  and  restoring  the  original
--       screen  contents.   Setting the environment variable NCGDB has the same
-+       The Console2 program's handling of the Microsoft Console API call  Cre-
-+       ateConsoleScreenBuffer  is defective.  Applications which use this will
-+       hang.  However, it is possible to simulate the action of this  call  by
-+       mapping  coordinates,  explicitly  saving  and  restoring  the original
-+       screen contents.  Setting the environment variable NCGDB has  the  same
-        effect.
- 
- 
-

    NCURSES_GPM_TERMS

    -        This applies only to ncurses configured to use the GPM interface.
- 
--       If present, the environment variable is a list of one or more  terminal
--       names  against which the TERM environment variable is matched.  Setting
--       it to an empty value disables the GPM  interface;  using  the  built-in
-+       If  present, the environment variable is a list of one or more terminal
-+       names against which the TERM environment variable is matched.   Setting
-+       it  to  an  empty  value disables the GPM interface; using the built-in
-        support for xterm, etc.
- 
-        If the environment variable is absent, ncurses will attempt to open GPM
-@@ -892,38 +895,38 @@
- 
- 
-

    NCURSES_NO_HARD_TABS

    --       Ncurses may use tabs as part of the cursor movement  optimization.   In
--       some  cases,  your  terminal driver may not handle these properly.  Set
--       this environment variable to disable the feature.  You can also  adjust
-+       Ncurses  may  use tabs as part of the cursor movement optimization.  In
-+       some cases, your terminal driver may not handle  these  properly.   Set
-+       this  environment variable to disable the feature.  You can also adjust
-        your stty settings to avoid the problem.
- 
- 
-

    NCURSES_NO_MAGIC_COOKIE

    --       Some  terminals  use a magic-cookie feature which requires special han-
-+       Some terminals use a magic-cookie feature which requires  special  han-
-        dling to make highlighting and other video attributes display properly.
--       You  can suppress the highlighting entirely for these terminals by set-
-+       You can suppress the highlighting entirely for these terminals by  set-
-        ting this environment variable.
- 
- 
-

    NCURSES_NO_PADDING

    --       Most of the terminal descriptions in the terminfo database are  written
--       for  real  "hardware"  terminals.   Many  people use terminal emulators
-+       Most  of the terminal descriptions in the terminfo database are written
-+       for real "hardware" terminals.   Many  people  use  terminal  emulators
-        which run in a windowing environment and use curses-based applications.
--       Terminal  emulators  can  duplicate  all  of the important aspects of a
--       hardware terminal, but they do not  have  the  same  limitations.   The
--       chief  limitation  of  a  hardware terminal from the standpoint of your
--       application is the management of  dataflow,  i.e.,  timing.   Unless  a
--       hardware  terminal  is  interfaced  into a terminal concentrator (which
-+       Terminal emulators can duplicate all of  the  important  aspects  of  a
-+       hardware  terminal,  but  they  do  not have the same limitations.  The
-+       chief limitation of a hardware terminal from  the  standpoint  of  your
-+       application  is  the  management  of  dataflow, i.e., timing.  Unless a
-+       hardware terminal is interfaced into  a  terminal  concentrator  (which
-        does flow control), it (or your application) must manage dataflow, pre-
-        venting overruns.  The cheapest solution (no hardware cost) is for your
--       program to do this by pausing after operations that the  terminal  does
-+       program  to  do this by pausing after operations that the terminal does
-        slowly, such as clearing the display.
- 
--       As  a  result,  many  terminal  descriptions (including the vt100) have
--       delay times embedded.  You may wish to use these descriptions, but  not
-+       As a result, many terminal  descriptions  (including  the  vt100)  have
-+       delay  times embedded.  You may wish to use these descriptions, but not
-        want to pay the performance penalty.
- 
--       Set  the  NCURSES_NO_PADDING  environment  variable  to disable all but
-+       Set the NCURSES_NO_PADDING environment  variable  to  disable  all  but
-        mandatory padding.  Mandatory padding is used as a part of special con-
-        trol sequences such as flash.
- 
-@@ -935,44 +938,44 @@
- 
-           o   continued though 5.9 patch 20130126
- 
--       ncurses  enabled  buffered output during terminal initialization.  This
-+       ncurses enabled buffered output during terminal  initialization.   This
-        was done (as in SVr4 curses) for performance reasons.  For testing pur-
--       poses,  both of ncurses and certain applications, this feature was made
-+       poses, both of ncurses and certain applications, this feature was  made
-        optional.   Setting  the  NCURSES_NO_SETBUF  variable  disabled  output
--       buffering,  leaving  the output in the original (usually line buffered)
-+       buffering, leaving the output in the original (usually  line  buffered)
-        mode.
- 
--       In the current implementation, ncurses performs its own  buffering  and
--       does  not require this workaround.  It does not modify the buffering of
-+       In  the  current implementation, ncurses performs its own buffering and
-+       does not require this workaround.  It does not modify the buffering  of
-        the standard output.
- 
--       The reason for the change was to make the behavior for  interrupts  and
--       other  signals  more  robust.   One drawback is that certain nonconven-
--       tional programs would mix ordinary stdio calls with ncurses  calls  and
--       (usually)  work.  This is no longer possible since ncurses is not using
--       the buffered standard output but its  own  output  (to  the  same  file
-+       The  reason  for the change was to make the behavior for interrupts and
-+       other signals more robust.  One drawback  is  that  certain  nonconven-
-+       tional  programs  would mix ordinary stdio calls with ncurses calls and
-+       (usually) work.  This is no longer possible since ncurses is not  using
-+       the  buffered  standard  output  but  its  own output (to the same file
-        descriptor).  As a special case, the low-level calls such as putp still
-        use the standard output.  But high-level curses calls do not.
- 
- 
-

    NCURSES_NO_UTF8_ACS

    --       During initialization, the ncurses library  checks  for  special  cases
-+       During  initialization,  the  ncurses  library checks for special cases
-        where VT100 line-drawing (and the corresponding alternate character set
--       capabilities) described in  the  terminfo  are  known  to  be  missing.
--       Specifically,  when running in a UTF-8 locale, the Linux console emula-
--       tor and the GNU screen program ignore these.  Ncurses checks  the  TERM
--       environment  variable  for  these.  For other special cases, you should
-+       capabilities)  described  in  the  terminfo  are  known  to be missing.
-+       Specifically, when running in a UTF-8 locale, the Linux console  emula-
-+       tor  and  the GNU screen program ignore these.  Ncurses checks the TERM
-+       environment variable for these.  For other special  cases,  you  should
-        set this environment variable.  Doing this tells ncurses to use Unicode
--       values  which  correspond to the VT100 line-drawing glyphs.  That works
--       for the special cases cited, and is likely to work for terminal  emula-
-+       values which correspond to the VT100 line-drawing glyphs.   That  works
-+       for  the special cases cited, and is likely to work for terminal emula-
-        tors.
- 
-        When setting this variable, you should set it to a nonzero value.  Set-
--       ting it to zero (or to a nonnumber)  disables  the  special  check  for
-+       ting  it  to  zero  (or  to a nonnumber) disables the special check for
-        "linux" and "screen".
- 
--       As  an  alternative  to the environment variable, ncurses checks for an
--       extended terminfo capability U8.  This is a  numeric  capability  which
-+       As an alternative to the environment variable, ncurses  checks  for  an
-+       extended  terminfo  capability  U8.  This is a numeric capability which
-        can be compiled using tic -x.  For example
- 
-           # linux console, if patched to provide working
-@@ -984,67 +987,67 @@
-           xterm-utf8|xterm relying on UTF-8 line-graphics,
-                   U8#1, use=xterm,
- 
--       The  name  "U8" is chosen to be two characters, to permit it to be used
-+       The name "U8" is chosen to be two characters, to permit it to  be  used
-        by applications that use ncurses' termcap interface.
- 
- 
-

    NCURSES_TRACE

    --       During  initialization,  the  ncurses  debugging  library  checks   the
--       NCURSES_TRACE  environment  variable.   If  it is defined, to a numeric
--       value, ncurses calls the trace function, using that value as the  argu-
-+       During   initialization,  the  ncurses  debugging  library  checks  the
-+       NCURSES_TRACE environment variable.  If it is  defined,  to  a  numeric
-+       value,  ncurses calls the trace function, using that value as the argu-
-        ment.
- 
--       The  argument  values,  which  are defined in curses.h, provide several
--       types of information.  When running with traces enabled, your  applica-
-+       The argument values, which are defined  in  curses.h,  provide  several
-+       types  of information.  When running with traces enabled, your applica-
-        tion will write the file trace to the current directory.
- 
-        See curs_trace(3x) for more information.
- 
- 
-

    TERM

    --       Denotes  your  terminal  type.   Each terminal type is distinct, though
-+       Denotes your terminal type.  Each terminal  type  is  distinct,  though
-        many are similar.
- 
--       TERM is commonly set by terminal emulators to help applications find  a
-+       TERM  is commonly set by terminal emulators to help applications find a
-        workable terminal description.  Some of those choose a popular approxi-
--       mation, e.g., "ansi", "vt100", "xterm" rather than an exact  fit.   Not
--       infrequently,  your  application will have problems with that approach,
-+       mation,  e.g.,  "ansi", "vt100", "xterm" rather than an exact fit.  Not
-+       infrequently, your application will have problems with  that  approach,
-        e.g., incorrect function-key definitions.
- 
--       If you set TERM in your environment, it has no effect on the  operation
--       of  the  terminal  emulator.  It only affects the way applications work
--       within the terminal.  Likewise, as a general rule (xterm being  a  rare
--       exception),  terminal  emulators  which  allow you to specify TERM as a
--       parameter or configuration value do not change their behavior to  match
-+       If  you set TERM in your environment, it has no effect on the operation
-+       of the terminal emulator.  It only affects the  way  applications  work
-+       within  the  terminal.  Likewise, as a general rule (xterm being a rare
-+       exception), terminal emulators which allow you to  specify  TERM  as  a
-+       parameter  or configuration value do not change their behavior to match
-        that setting.
- 
- 
-

    TERMCAP

    --       If  the  ncurses  library  has  been  configured  with termcap support,
--       ncurses will check for a terminal's description in termcap form  if  it
-+       If the ncurses  library  has  been  configured  with  termcap  support,
-+       ncurses  will  check for a terminal's description in termcap form if it
-        is not available in the terminfo database.
- 
-        The TERMCAP environment variable contains either a terminal description
-        (with newlines stripped out), or a file name telling where the informa-
--       tion  denoted by the TERM environment variable exists.  In either case,
--       setting it directs ncurses to ignore the usual place for this  informa-
-+       tion denoted by the TERM environment variable exists.  In either  case,
-+       setting  it directs ncurses to ignore the usual place for this informa-
-        tion, e.g., /etc/termcap.
- 
- 
-

    TERMINFO

    --       ncurses  can  be  configured  to read from multiple terminal databases.
--       The TERMINFO variable overrides the location for the  default  terminal
--       database.   Terminal  descriptions  (in  terminal format) are stored in
-+       ncurses can be configured to read  from  multiple  terminal  databases.
-+       The  TERMINFO  variable overrides the location for the default terminal
-+       database.  Terminal descriptions (in terminal  format)  are  stored  in
-        terminal databases:
- 
-        o   Normally these are stored in a directory tree, using subdirectories
-            named by the first letter of the terminal names therein.
- 
-            This is the scheme used in System V, which legacy Unix systems use,
--           and the TERMINFO variable is used by curses applications  on  those
-+           and  the  TERMINFO variable is used by curses applications on those
-            systems to override the default location of the terminal database.
- 
--       o   If  ncurses  is  built  to use hashed databases, then each entry in
-+       o   If ncurses is built to use hashed databases,  then  each  entry  in
-            this list may be the path of a hashed database file, e.g.,
- 
-                /usr/share/terminfo.db
-@@ -1053,30 +1056,30 @@
- 
-                /usr/share/terminfo/
- 
--           The hashed database uses less disk-space and  is  a  little  faster
--           than  the  directory  tree.   However, some applications assume the
--           existence of the directory tree, reading it  directly  rather  than
-+           The  hashed  database  uses  less disk-space and is a little faster
-+           than the directory tree.  However,  some  applications  assume  the
-+           existence  of  the  directory tree, reading it directly rather than
-            using the terminfo library calls.
- 
--       o   If  ncurses  is  built  with  a  support  for reading termcap files
--           directly, then an entry in this list may be the path of  a  termcap
-+       o   If ncurses is built  with  a  support  for  reading  termcap  files
-+           directly,  then  an entry in this list may be the path of a termcap
-            file.
- 
-        o   If the TERMINFO variable begins with "hex:" or "b64:", ncurses uses
--           the remainder of that variable as a compiled terminal  description.
-+           the  remainder of that variable as a compiled terminal description.
-            You might produce the base64 format using infocmp(1m):
- 
-                TERMINFO="$(infocmp -0 -Q2 -q)"
-                export TERMINFO
- 
--           The  compiled description is used if it corresponds to the terminal
-+           The compiled description is used if it corresponds to the  terminal
-            identified by the TERM variable.
- 
--       Setting TERMINFO is the simplest, but not the only way to set  location
--       of  the default terminal database.  The complete list of database loca-
-+       Setting  TERMINFO is the simplest, but not the only way to set location
-+       of the default terminal database.  The complete list of database  loca-
-        tions in order follows:
- 
--          o   the last terminal database to which ncurses wrote,  if  any,  is
-+          o   the  last  terminal  database to which ncurses wrote, if any, is
-               searched first
- 
-           o   the location specified by the TERMINFO environment variable
-@@ -1085,7 +1088,7 @@
- 
-           o   locations listed in the TERMINFO_DIRS environment variable
- 
--          o   one  or  more  locations whose names are configured and compiled
-+          o   one or more locations whose names are  configured  and  compiled
-               into the ncurses library, i.e.,
- 
-              o   /usr/local/ncurses/share/terminfo:/usr/share/terminfo (corre-
-@@ -1095,9 +1098,9 @@
- 
- 
-

    TERMINFO_DIRS

    --       Specifies  a  list  of  locations  to search for terminal descriptions.
--       Each location in the list is a terminal database as  described  in  the
--       section  on  the  TERMINFO  variable.   The list is separated by colons
-+       Specifies a list of locations  to  search  for  terminal  descriptions.
-+       Each  location  in  the list is a terminal database as described in the
-+       section on the TERMINFO variable.  The  list  is  separated  by  colons
-        (i.e., ":") on Unix, semicolons on OS/2 EMX.
- 
-        There is no corresponding feature in System V terminfo; it is an exten-
-@@ -1105,11 +1108,11 @@
- 
- 
-

    TERMPATH

    --       If  TERMCAP  does not hold a file name then ncurses checks the TERMPATH
--       environment variable.  This is a list of filenames separated by  spaces
-+       If TERMCAP does not hold a file name then ncurses checks  the  TERMPATH
-+       environment  variable.  This is a list of filenames separated by spaces
-        or colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
- 
--       If  the  TERMPATH environment variable is not set, ncurses looks in the
-+       If the TERMPATH environment variable is not set, ncurses looks  in  the
-        files
- 
-            /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
-@@ -1117,7 +1120,7 @@
-        in that order.
- 
-        The library may be configured to disregard the following variables when
--       the  current  user  is the superuser (root), or if the application uses
-+       the current user is the superuser (root), or if  the  application  uses
-        setuid or setgid permissions:
- 
-            $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
-@@ -1125,8 +1128,8 @@
- 
-

    ALTERNATE CONFIGURATIONS

    -        Several different configurations are possible, depending on the config-
--       ure  script  options  used when building ncurses.  There are a few main
--       options whose effects are visible to the applications  developer  using
-+       ure script options used when building ncurses.  There are  a  few  main
-+       options  whose  effects are visible to the applications developer using
-        ncurses:
- 
-        --disable-overwrite
-@@ -1134,19 +1137,19 @@
- 
-                 #include <curses.h>
- 
--            This  option  is  used to avoid filename conflicts when ncurses is
-+            This option is used to avoid filename conflicts  when  ncurses  is
-             not the main implementation of curses of the computer.  If ncurses
--            is  installed disabling overwrite, it puts its headers in a subdi-
-+            is installed disabling overwrite, it puts its headers in a  subdi-
-             rectory, e.g.,
- 
-                 #include <ncurses/curses.h>
- 
--            It also omits a  symbolic  link  which  would  allow  you  to  use
-+            It  also  omits  a  symbolic  link  which  would  allow you to use
-             -lcurses to build executables.
- 
-        --enable-widec
--            The  configure  script  renames  the  library  and  (if the --dis-
--            able-overwrite option is used) puts the header files in a  differ-
-+            The configure script  renames  the  library  and  (if  the  --dis-
-+            able-overwrite  option is used) puts the header files in a differ-
-             ent subdirectory.  All of the library names have a "w" appended to
-             them, i.e., instead of
- 
-@@ -1156,45 +1159,45 @@
- 
-                 -lncursesw
- 
--            You must also enable the wide-character  features  in  the  header
--            file  when  compiling  for  the  wide-character library to use the
--            extended (wide-character) functions.   The  symbol  which  enables
-+            You  must  also  enable  the wide-character features in the header
-+            file when compiling for the  wide-character  library  to  use  the
-+            extended  (wide-character)  functions.   The  symbol which enables
-             these features has changed since XSI Curses, Issue 4:
- 
--            o   Originally,  the  wide-character  feature  required the symbol
-+            o   Originally, the wide-character  feature  required  the  symbol
-                 _XOPEN_SOURCE_EXTENDED  but  that  was  only  valid  for  XPG4
-                 (1996).
- 
--            o   Later,  that was deemed conflicting with _XOPEN_SOURCE defined
-+            o   Later, that was deemed conflicting with _XOPEN_SOURCE  defined
-                 to 500.
- 
--            o   As of mid-2018, none of the features  in  this  implementation
--                require  a  _XOPEN_SOURCE  feature greater than 600.  However,
-+            o   As  of  mid-2018,  none of the features in this implementation
-+                require a _XOPEN_SOURCE feature greater  than  600.   However,
-                 X/Open Curses, Issue 7 (2009) recommends defining it to 700.
- 
--            o   Alternatively,  you  can  enable  the  feature   by   defining
--                NCURSES_WIDECHAR  with  the caveat that some other header file
--                than curses.h may require a specific value  for  _XOPEN_SOURCE
-+            o   Alternatively,   you   can  enable  the  feature  by  defining
-+                NCURSES_WIDECHAR with the caveat that some other  header  file
-+                than  curses.h  may require a specific value for _XOPEN_SOURCE
-                 (or a system-specific symbol).
- 
--            The  curses.h  file  which  is  installed  for  the wide-character
--            library is designed to be compatible  with  the  normal  library's
--            header.   Only  the size of the WINDOW structure differs, and very
-+            The curses.h  file  which  is  installed  for  the  wide-character
-+            library  is  designed  to  be compatible with the normal library's
-+            header.  Only the size of the WINDOW structure differs,  and  very
-             few applications require more than a pointer to WINDOWs.
- 
--            If the headers are installed allowing overwrite, the  wide-charac-
--            ter  library's headers should be installed last, to allow applica-
--            tions to be built using either library from the same set of  head-
-+            If  the headers are installed allowing overwrite, the wide-charac-
-+            ter library's headers should be installed last, to allow  applica-
-+            tions  to be built using either library from the same set of head-
-             ers.
- 
-        --with-pthread
--            The  configure  script  renames  the  library.  All of the library
--            names have a "t"  appended  to  them  (before  any  "w"  added  by
-+            The configure script renames the  library.   All  of  the  library
-+            names  have  a  "t"  appended  to  them  (before  any "w" added by
-             --enable-widec).
- 
-             The global variables such as LINES are replaced by macros to allow
-             read-only access.  At the same time, setter-functions are provided
--            to  set  these  values.   Some applications (very few) may require
-+            to set these values.  Some applications  (very  few)  may  require
-             changes to work with this convention.
- 
-        --with-shared
-@@ -1204,79 +1207,79 @@
-        --with-debug
- 
-        --with-profile
--            The shared and normal (static) library names differ by their  suf-
--            fixes,  e.g.,  libncurses.so and libncurses.a.  The debug and pro-
--            filing libraries add a "_g" and a "_p" to the root  names  respec-
-+            The  shared and normal (static) library names differ by their suf-
-+            fixes, e.g., libncurses.so and libncurses.a.  The debug  and  pro-
-+            filing  libraries  add a "_g" and a "_p" to the root names respec-
-             tively, e.g., libncurses_g.a and libncurses_p.a.
- 
-        --with-trace
--            The  trace  function normally resides in the debug library, but it
-+            The trace function normally resides in the debug library,  but  it
-             is sometimes useful to configure this in the shared library.  Con-
--            figure  scripts  should  check for the function's existence rather
-+            figure scripts should check for the  function's  existence  rather
-             than assuming it is always in the debug library.
- 
- 
-

    FILES

    -        /usr/share/tabset
--            directory containing initialization files for the  terminal  capa-
-+            directory  containing  initialization files for the terminal capa-
-             bility database /usr/share/terminfo terminal capability database
- 
- 
-

    SEE ALSO

    --       terminfo(5)  and  related  pages whose names begin "curs_" for detailed
-+       terminfo(5) and related pages whose names begin  "curs_"  for  detailed
-        routine descriptions.
-        curs_variables(3x)
-        user_caps(5) for user-defined capabilities
- 
- 
-

    EXTENSIONS

    --       The ncurses library can be compiled with an option (-DUSE_GETCAP)  that
--       falls  back  to  the  old-style /etc/termcap file if the terminal setup
--       code cannot find a terminfo entry corresponding to TERM.  Use  of  this
--       feature  is not recommended, as it essentially includes an entire term-
--       cap compiler in the ncurses startup code, at significant cost  in  core
-+       The  ncurses library can be compiled with an option (-DUSE_GETCAP) that
-+       falls back to the old-style /etc/termcap file  if  the  terminal  setup
-+       code  cannot  find a terminfo entry corresponding to TERM.  Use of this
-+       feature is not recommended, as it essentially includes an entire  term-
-+       cap  compiler  in the ncurses startup code, at significant cost in core
-        and startup cycles.
- 
--       The  ncurses  library includes facilities for capturing mouse events on
--       certain terminals (including xterm).   See  the  curs_mouse(3x)  manual
-+       The ncurses library includes facilities for capturing mouse  events  on
-+       certain  terminals  (including  xterm).   See the curs_mouse(3x) manual
-        page for details.
- 
-        The ncurses library includes facilities for responding to window resiz-
-        ing events, e.g., when running in an xterm.  See the resizeterm(3x) and
--       wresize(3x)  manual pages for details.  In addition, the library may be
-+       wresize(3x) manual pages for details.  In addition, the library may  be
-        configured with a SIGWINCH handler.
- 
--       The ncurses library extends the fixed set of function key  capabilities
--       of  terminals by allowing the application designer to define additional
--       key sequences at runtime.  See the define_key(3x) key_defined(3x),  and
-+       The  ncurses library extends the fixed set of function key capabilities
-+       of terminals by allowing the application designer to define  additional
-+       key  sequences at runtime.  See the define_key(3x) key_defined(3x), and
-        keyok(3x) manual pages for details.
- 
--       The  ncurses  library  can  exploit the capabilities of terminals which
--       implement the ISO-6429 SGR 39 and  SGR  49  controls,  which  allow  an
--       application  to reset the terminal to its original foreground and back-
-+       The ncurses library can exploit the  capabilities  of  terminals  which
-+       implement  the  ISO-6429  SGR  39  and  SGR 49 controls, which allow an
-+       application to reset the terminal to its original foreground and  back-
-        ground colors.  From the users' perspective, the application is able to
--       draw  colored  text  on  a background whose color is set independently,
--       providing better control over color contrasts.   See  the  default_col-
-+       draw colored text on a background whose  color  is  set  independently,
-+       providing  better  control  over color contrasts.  See the default_col-
-        ors(3x) manual page for details.
- 
--       The  ncurses library includes a function for directing application out-
--       put  to  a  printer  attached  to  the  terminal   device.    See   the
-+       The ncurses library includes a function for directing application  out-
-+       put   to   a   printer  attached  to  the  terminal  device.   See  the
-        curs_print(3x) manual page for details.
- 
- 
-

    PORTABILITY

    --       The  ncurses  library  is intended to be BASE-level conformant with XSI
--       Curses.  The EXTENDED XSI Curses functionality  (including  color  sup-
-+       The ncurses library is intended to be BASE-level  conformant  with  XSI
-+       Curses.   The  EXTENDED  XSI Curses functionality (including color sup-
-        port) is supported.
- 
--       A  small  number  of local differences (that is, individual differences
--       between the XSI Curses and ncurses calls) are described in  PORTABILITY
-+       A small number of local differences (that  is,  individual  differences
-+       between  the XSI Curses and ncurses calls) are described in PORTABILITY
-        sections of the library man pages.
- 
-        Unlike other implementations, this one checks parameters such as point-
--       ers to WINDOW structures to ensure they are not null.  The main  reason
--       for  providing this behavior is to guard against programmer error.  The
--       standard interface does not provide a way for the library  to  tell  an
-+       ers  to WINDOW structures to ensure they are not null.  The main reason
-+       for providing this behavior is to guard against programmer error.   The
-+       standard  interface  does  not provide a way for the library to tell an
-        application which of several possible errors were detected.  Relying on
-        this (or some other) extension will adversely affect the portability of
-        curses applications.
-@@ -1286,15 +1289,15 @@
-        o   The routine has_key is not part of XPG4, nor is it present in SVr4.
-            See the curs_getch(3x) manual page for details.
- 
--       o   The routine slk_attr is not part of XPG4,  nor  is  it  present  in
-+       o   The  routine  slk_attr  is  not  part of XPG4, nor is it present in
-            SVr4.  See the curs_slk(3x) manual page for details.
- 
--       o   The  routines  getmouse,  mousemask, ungetmouse, mouseinterval, and
--           wenclose relating to mouse interfacing are not part  of  XPG4,  nor
--           are  they  present in SVr4.  See the curs_mouse(3x) manual page for
-+       o   The routines getmouse, mousemask,  ungetmouse,  mouseinterval,  and
-+           wenclose  relating  to  mouse interfacing are not part of XPG4, nor
-+           are they present in SVr4.  See the curs_mouse(3x) manual  page  for
-            details.
- 
--       o   The routine mcprint was not present in any previous  curses  imple-
-+       o   The  routine  mcprint was not present in any previous curses imple-
-            mentation.  See the curs_print(3x) manual page for details.
- 
-        o   The routine wresize is not part of XPG4, nor is it present in SVr4.
-@@ -1304,28 +1307,28 @@
-            tion programs.  See curs_opaque(3x) for the discussion of is_scrol-
-            lok, etc.
- 
--       o   This implementation can be configured to provide  rudimentary  sup-
--           port  for  multi-threaded  applications.   See curs_threads(3x) for
-+       o   This  implementation  can be configured to provide rudimentary sup-
-+           port for multi-threaded  applications.   See  curs_threads(3x)  for
-            details.
- 
--       o   This implementation can also be configured  to  provide  a  set  of
--           functions  which  improve  the  ability to manage multiple screens.
-+       o   This  implementation  can  also  be  configured to provide a set of
-+           functions which improve the ability  to  manage  multiple  screens.
-            See curs_sp_funcs(3x) for details.
- 
--       In historic curses versions, delays embedded in  the  capabilities  cr,
--       ind,  cub1,  ff  and tab activated corresponding delay bits in the UNIX
-+       In  historic  curses  versions, delays embedded in the capabilities cr,
-+       ind, cub1, ff and tab activated corresponding delay bits  in  the  UNIX
-        tty driver.  In this implementation, all padding is done by sending NUL
--       bytes.   This method is slightly more expensive, but narrows the inter-
--       face to the UNIX  kernel  significantly  and  increases  the  package's
-+       bytes.  This method is slightly more expensive, but narrows the  inter-
-+       face  to  the  UNIX  kernel  significantly  and increases the package's
-        portability correspondingly.
- 
- 
-

    NOTES

    --       The  header  file  <curses.h>  automatically  includes the header files
-+       The header file <curses.h>  automatically  includes  the  header  files
-        <stdio.h> and <unctrl.h>.
- 
--       If standard output from a ncurses program is re-directed  to  something
--       which  is not a tty, screen updates will be directed to standard error.
-+       If  standard  output from a ncurses program is re-directed to something
-+       which is not a tty, screen updates will be directed to standard  error.
-        This was an undocumented feature of AT&T System V Release 3 curses.
- 
- 
-Index: doc/html/man/ncurses6-config.1.html
---- ncurses-6.1-20191123+/doc/html/man/ncurses6-config.1.html	2019-10-27 00:15:51.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/ncurses6-config.1.html	2019-11-30 22:45:01.000000000 +0000
-@@ -112,7 +112,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.1-20191123+/doc/html/man/panel.3x.html	2019-10-27 00:15:51.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/panel.3x.html	2019-11-30 22:45:01.000000000 +0000
-@@ -204,7 +204,7 @@
-

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/tabs.1.html
---- ncurses-6.1-20191123+/doc/html/man/tabs.1.html	2019-10-27 00:15:51.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/tabs.1.html	2019-11-30 22:45:01.000000000 +0000
-@@ -205,7 +205,7 @@
-

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
- 
-Index: doc/html/man/term_variables.3x.html
---- ncurses-6.1-20191123+/doc/html/man/term_variables.3x.html	2019-03-23 22:00:07.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/term_variables.3x.html	2019-11-30 22:45:01.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: term_variables.3x,v 1.10 2019/03/23 21:51:12 tom Exp @
-+  * @Id: term_variables.3x,v 1.11 2019/11/30 20:51:36 tom Exp @
- -->
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.1-20191123+/doc/html/man/terminfo.5.html	2019-10-27 00:15:51.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/terminfo.5.html	2019-11-30 22:45:01.000000000 +0000
-@@ -60,7 +60,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: terminfo.tail,v 1.97 2019/07/20 10:20:57 tom Exp @
-+  * @Id: terminfo.tail,v 1.98 2019/11/30 20:54:32 tom Exp @
-   *.in -2
-   *.in +2
-   *.in -2
-@@ -103,7 +103,7 @@
-        have, by specifying how to perform screen operations, and by specifying
-        padding requirements and initialization sequences.
- 
--       This manual describes ncurses version 6.1 (patch 20191026).
-+       This manual describes ncurses version 6.1 (patch 20191130).
- 
- 
-

    Terminfo Entry Syntax

    -Index: doc/html/man/tic.1m.html
---- ncurses-6.1-20191123+/doc/html/man/tic.1m.html	2019-10-27 00:15:51.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/tic.1m.html	2019-11-30 22:45:01.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tic.1m,v 1.75 2019/10/12 20:56:38 tom Exp @
-+  * @Id: tic.1m,v 1.76 2019/11/30 20:51:55 tom Exp @
- -->
- 
- 
-@@ -460,7 +460,7 @@
-        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-        term(5).  terminfo(5).  user_caps(5).
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/toe.1m.html
---- ncurses-6.1-20191123+/doc/html/man/toe.1m.html	2019-10-27 00:15:51.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/toe.1m.html	2019-11-30 22:45:01.000000000 +0000
-@@ -170,7 +170,7 @@
-        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
-        minfo(5).
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.1-20191123+/doc/html/man/tput.1.html	2019-10-27 00:15:51.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/tput.1.html	2019-11-30 22:45:01.000000000 +0000
-@@ -522,7 +522,7 @@
-

    SEE ALSO

    -        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.1-20191123+/doc/html/man/tset.1.html	2019-10-27 00:15:51.000000000 +0000
-+++ ncurses-6.1-20191130/doc/html/man/tset.1.html	2019-11-30 22:45:01.000000000 +0000
-@@ -389,7 +389,7 @@
-        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
-        ttys(5), environ(7)
- 
--       This describes ncurses version 6.1 (patch 20191026).
-+       This describes ncurses version 6.1 (patch 20191130).
- 
- 
- 
-Index: man/curs_add_wchstr.3x
-Prereq:  1.11 
---- ncurses-6.1-20191123+/man/curs_add_wchstr.3x	2017-11-18 23:56:00.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_add_wchstr.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2002-2012,2017 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2002-2017,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_add_wchstr.3x,v 1.11 2017/11/18 23:56:00 tom Exp $
-+.\" $Id: curs_add_wchstr.3x,v 1.12 2019/11/30 21:06:30 tom Exp $
- .TH curs_add_wchstr 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -102,7 +106,7 @@
- This implementation returns an error
- if the window pointer is null.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH NOTES
-Index: man/curs_addch.3x
-Prereq:  1.47 
---- ncurses-6.1-20191123+/man/curs_addch.3x	2019-02-16 23:50:17.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_addch.3x	2019-11-30 20:07:00.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_addch.3x,v 1.47 2019/02/16 23:50:17 tom Exp $
-+.\" $Id: curs_addch.3x,v 1.50 2019/11/30 20:07:00 tom Exp $
- .TH curs_addch 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -185,6 +185,31 @@
- X/Open Curses states that the \fIACS_\fP definitions are \fBchar\fP constants.
- For the wide-character implementation (see \fBcurs_add_wch\fP),
- there are analogous \fIWACS_\fP definitions which are \fBcchar_t\fP constants.
-+Some implementations are problematic:
-+.bP
-+Some implementations define the ACS symbols to a constant
-+(such as Solaris), while others define those to entries in an array.
-+.IP
-+This implementation uses an array \fBacs_map\fP, as done in SVr4 curses.
-+NetBSD also uses an array, actually named \fB_acs_char\fP, with a \fB#define\fP
-+for compatibility.
-+.bP
-+HPUX curses equates some of the \fIACS_\fP symbols
-+to the analogous \fIWACS_\fP symbols as if the \fIACS_\fP symbols were
-+wide characters.
-+The misdefined symbols are the arrows
-+and other symbols which are not used for line-drawing.
-+.bP
-+X/Open Curses (issues 2 through 7) has a typographical error
-+for the ACS_LANTERN symbol, equating its \*(``VT100+ Character\*(''
-+to \fBI\fP (capital I), while the header files for SVr4 curses
-+and the various implementations use \fBi\fP (lowercase).
-+.IP
-+None of the terminal descriptions on Unix platforms use uppercase-I,
-+except for Solaris (i.e., \fIscreen\fP's terminal description,
-+apparently based on the X/Open documentation around 1995).
-+On the other hand, the terminal description \fIgs6300\fP
-+(AT&T PC6300 with EMOTS Terminal Emulator) uses lowercase-i.
- .LP
- Some ACS symbols
- (ACS_S3,
-@@ -224,7 +249,7 @@
- separated from the character information which is packed in a \fBchtype\fP
- to pass to \fBwaddch\fP.
- .PP
--In this implementation, \fBchtype\fP holds eight bits.
-+In this implementation, \fBchtype\fP holds an eight-bit character.
- But ncurses allows multibyte characters to be passed in a succession
- of calls to \fBwaddch\fP.
- The other implementations do not do this;
-Index: man/curs_addchstr.3x
-Prereq:  1.17 
---- ncurses-6.1-20191123+/man/curs_addchstr.3x	2017-11-18 23:56:00.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_addchstr.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2012,2017 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2017,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_addchstr.3x,v 1.17 2017/11/18 23:56:00 tom Exp $
-+.\" $Id: curs_addchstr.3x,v 1.18 2019/11/30 21:06:30 tom Exp $
- .TH curs_addchstr 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -96,7 +100,7 @@
- This implementation returns an error
- if the window pointer is null.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH NOTES
-Index: man/curs_addstr.3x
-Prereq:  1.18 
---- ncurses-6.1-20191123+/man/curs_addstr.3x	2017-11-18 23:56:00.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_addstr.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2012,2017 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2017,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_addstr.3x,v 1.18 2017/11/18 23:56:00 tom Exp $
-+.\" $Id: curs_addstr.3x,v 1.19 2019/11/30 21:06:30 tom Exp $
- .TH curs_addstr 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -90,7 +94,7 @@
- .bP
- if the corresponding calls to \fBwaddch\fP return an error.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH NOTES
-Index: man/curs_addwstr.3x
-Prereq:  1.12 
---- ncurses-6.1-20191123+/man/curs_addwstr.3x	2017-11-18 23:56:00.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_addwstr.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2002-2012,2017 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2002-2017,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_addwstr.3x,v 1.12 2017/11/18 23:56:00 tom Exp $
-+.\" $Id: curs_addwstr.3x,v 1.13 2019/11/30 21:06:30 tom Exp $
- .TH curs_addwstr 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -92,7 +96,7 @@
- .bP
- if the corresponding calls to \fBwadd_wch\fP return an error.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH NOTES
-Index: man/curs_attr.3x
-Prereq:  1.64 
---- ncurses-6.1-20191123+/man/curs_attr.3x	2018-07-28 22:15:59.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_attr.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_attr.3x,v 1.64 2018/07/28 22:15:59 tom Exp $
-+.\" $Id: curs_attr.3x,v 1.65 2019/11/30 21:06:30 tom Exp $
- .TH curs_attr 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -262,7 +262,7 @@
- as \fBattrset(A_NORMAL)\fR or \fBattrset(0)\fR, that is, it turns off all
- attributes.
- .PP
--X/Open does not mark these "restricted", because
-+X/Open does not mark these \*(``restricted\*('', because
- .bP
- they have well established legacy use, and
- .bP
-@@ -512,7 +512,7 @@
- The XSI Curses standard states that whether the traditional functions
- \fBattron\fR/\fBattroff\fR/\fBattrset\fR can manipulate attributes other than
- \fBA_BLINK\fR, \fBA_BOLD\fR, \fBA_DIM\fR, \fBA_REVERSE\fR, \fBA_STANDOUT\fR, or
--\fBA_UNDERLINE\fR is "unspecified".
-+\fBA_UNDERLINE\fR is \*(``unspecified\*(''.
- Under this implementation as well as
- SVr4 curses, these functions correctly manipulate all other highlights
- (specifically, \fBA_ALTCHARSET\fR, \fBA_PROTECT\fR, and \fBA_INVIS\fR).
-@@ -590,7 +590,7 @@
- does not return an error if either of the parameters of \fBwattr_get\fP
- used for retrieving attribute or color-pair values is \fBNULL\fP.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .\" ---------------------------------------------------------------------------
-Index: man/curs_border.3x
-Prereq:  1.23 
---- ncurses-6.1-20191123+/man/curs_border.3x	2018-07-28 21:34:06.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_border.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2010,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_border.3x,v 1.23 2018/07/28 21:34:06 tom Exp $
-+.\" $Id: curs_border.3x,v 1.24 2019/11/30 21:06:30 tom Exp $
- .TH curs_border 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .na
- .hy 0
- .SH NAME
-@@ -142,7 +146,7 @@
- This implementation returns an error
- if the window pointer is null.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH NOTES
-Index: man/curs_border_set.3x
-Prereq:  1.11 
---- ncurses-6.1-20191123+/man/curs_border_set.3x	2012-11-03 23:03:59.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_border_set.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2002-2011,2012 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2002-2012,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_border_set.3x,v 1.11 2012/11/03 23:03:59 tom Exp $
-+.\" $Id: curs_border_set.3x,v 1.12 2019/11/30 21:06:30 tom Exp $
- .TH curs_border_set 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .na
- .hy 0
- .SH NAME
-@@ -196,7 +200,7 @@
- .PP
- Functions using a window parameter return an error if it is null.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH SEE ALSO
-Index: man/curs_delch.3x
-Prereq:  1.12 
---- ncurses-6.1-20191123+/man/curs_delch.3x	2018-07-28 21:34:06.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_delch.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2010,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_delch.3x,v 1.12 2018/07/28 21:34:06 tom Exp $
-+.\" $Id: curs_delch.3x,v 1.13 2019/11/30 21:06:30 tom Exp $
- .TH curs_delch 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBdelch\fR,
- \fBwdelch\fR,
-@@ -57,7 +61,7 @@
- specifies only "an integer value other than \fBERR\fR") upon successful
- completion.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH NOTES
-Index: man/curs_get_wch.3x
-Prereq:  1.11 
---- ncurses-6.1-20191123+/man/curs_get_wch.3x	2018-07-28 22:20:54.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_get_wch.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2002-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2002-2018,2019 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,10 +26,14 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_get_wch.3x,v 1.11 2018/07/28 22:20:54 tom Exp $
-+.\" $Id: curs_get_wch.3x,v 1.12 2019/11/30 21:06:30 tom Exp $
- .TH curs_get_wch 3X ""
- .na
- .hy 0
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -168,7 +172,7 @@
- Otherwise, the function returns
- \fBERR\fR.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH SEE ALSO
-Index: man/curs_get_wstr.3x
-Prereq:  1.18 
---- ncurses-6.1-20191123+/man/curs_get_wstr.3x	2019-07-20 19:14:56.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_get_wstr.3x	2019-11-30 20:59:22.000000000 +0000
-@@ -26,8 +26,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_get_wstr.3x,v 1.18 2019/07/20 19:14:56 tom Exp $
-+.\" $Id: curs_get_wstr.3x,v 1.19 2019/11/30 20:59:22 tom Exp $
- .TH curs_get_wstr 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -164,7 +168,7 @@
- returns an error if the associated call to \fBwget_wch\fP failed.
- .RE
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH PORTABILITY
-Index: man/curs_getcchar.3x
-Prereq:  1.21 
---- ncurses-6.1-20191123+/man/curs_getcchar.3x	2019-03-24 00:59:45.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_getcchar.3x	2019-11-30 22:22:32.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_getcchar.3x,v 1.21 2019/03/24 00:59:45 tom Exp $
-+.\" $Id: curs_getcchar.3x,v 1.23 2019/11/30 22:22:32 tom Exp $
- .TH curs_getcchar 3X ""
- .de bP
- .ie n  .IP \(bu 4
-@@ -145,6 +145,53 @@
- .PP
- Upon successful completion, \fBsetcchar\fP returns \fBOK\fP.
- Otherwise, it returns \fBERR\fP.
-+.SH PORTABILITY
-+The \fBCCHARW_MAX\fP symbol is specific to ncurses.
-+X/Open Curses does not provide details for the layout of the \fBcchar_t\fP
-+structure.
-+It tells what data are stored in it:
-+.bP
-+a spacing character (\fBwchar_t\fP, i.e., 32-bits).
-+.bP
-+non-spacing characters (again, \fBwchar_t\fP's).
-+.bP
-+attributes (at least 16 bits, inferred from the various ACS- and WACS-flags).
-+.bP
-+color pair (at least 16 bits, inferred from the \fBunsigned short\fP type).
-+.PP
-+The non-spacing characters are optional,
-+in the sense that zero or more may be stored in a \fBcchar_t\fP.
-+XOpen/Curses specifies a limit:
-+.RS 4
-+.PP
-+Implementations may limit the number of non-spacing characters that can be
-+associated with a spacing character, provided any limit is at least 5.
-+.RE
-+.PP
-+The Unix implementations at the time follow that limit:
-+.bP
-+AIX\ 4 and OSF1\ 4 use the same declaration with an array of 5 non-spacing
-+characters \fIz\fP and a single spacing character \fIc\fP.
-+.bP
-+HP-UX\ 10 uses an opaque structure with 28 bytes,
-+which is large enough for the 6 \fBwchar_t\fP values.
-+.bP
-+Solaris xpg4 curses uses a single array of 6 \fBwchar_t\fP values.
-+.PP
-+This implementation's \fBcchar_t\fP was defined in 1995
-+using \fB5\fP for the total of spacing and non-spacing characters
-+(\fBCCHARW_MAX\fP).
-+That was probably due to a misreading of the AIX\ 4 header files,
-+because the X/Open Curses document was not generally available at that time.
-+Later (in 2002), this detail was overlooked when beginning to implement
-+the functions using the structure.
-+.PP
-+In practice, even four non-spacing characters may seem enough.
-+X/Open Curses documents possible uses for non-spacing characters,
-+including using them for ligatures between characters
-+(a feature apparently not supported by any curses implementation).
-+Unicode does not limit the (analogous) number of combining characters,
-+so some applications may be affected.
- .SH SEE ALSO
- .PP
- Functions:
-Index: man/curs_getch.3x
-Prereq:  1.53 
---- ncurses-6.1-20191123+/man/curs_getch.3x	2018-07-28 22:15:59.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_getch.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,10 +27,14 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_getch.3x,v 1.53 2018/07/28 22:15:59 tom Exp $
-+.\" $Id: curs_getch.3x,v 1.54 2019/11/30 21:06:30 tom Exp $
- .TH curs_getch 3X ""
- .na
- .hy 0
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -143,7 +147,7 @@
- Not all of these are necessarily supported on any particular terminal.
- .bP
- The naming convention may seem obscure, with some apparent
--misspellings (such as "RSUME" for "resume").
-+misspellings (such as \*(``RSUME\*('' for \*(``resume\*('').
- The names correspond to the long terminfo capability names for the keys,
- and were defined long ago, in the 1980s.
- .PP
-@@ -308,7 +312,7 @@
- \fBEINTR\fR).
- .RE
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH NOTES
-@@ -337,10 +341,10 @@
- the standard ASCII characters for carriage-return and line-feed,
- .bP
- depending on whether \fBnl\fP or \fBnonl\fP was called,
--pressing "Enter" on the regular keyboard may return either a carriage-return
--or line-feed, and finally
-+pressing \*(``Enter\*('' on the regular keyboard
-+may return either a carriage-return or line-feed, and finally
- .bP
--"Enter or send" is the standard description for this key.
-+\*(``Enter or send\*('' is the standard description for this key.
- .PP
- When using \fBgetch\fR, \fBwgetch\fR, \fBmvgetch\fR, or
- \fBmvwgetch\fR, nocbreak mode (\fBnocbreak\fR) and echo mode
-Index: man/curs_in_wch.3x
-Prereq:  1.7 
---- ncurses-6.1-20191123+/man/curs_in_wch.3x	2018-07-28 22:20:54.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_in_wch.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2002-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2002-2018,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_in_wch.3x,v 1.7 2018/07/28 22:20:54 tom Exp $
-+.\" $Id: curs_in_wch.3x,v 1.8 2019/11/30 21:06:30 tom Exp $
- .TH curs_in_wch 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBin_wch\fR,
- \fBmvin_wch\fR,
-@@ -54,7 +58,7 @@
- returning \fBERR\fP in that case.
- Otherwise they return \fBOK\fP.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH NOTES
-Index: man/curs_in_wchstr.3x
-Prereq:  1.11 
---- ncurses-6.1-20191123+/man/curs_in_wchstr.3x	2018-07-28 21:34:56.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_in_wchstr.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2002-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2002-2018,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_in_wchstr.3x,v 1.11 2018/07/28 21:34:56 tom Exp $
-+.\" $Id: curs_in_wchstr.3x,v 1.12 2019/11/30 21:06:30 tom Exp $
- .TH curs_in_wchstr 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .na
- .hy 0
- .SH NAME
-@@ -105,7 +109,7 @@
- Otherwise, they return
- \fBERR\fR.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH PORTABILITY
-Index: man/curs_inch.3x
-Prereq:  1.21 
---- ncurses-6.1-20191123+/man/curs_inch.3x	2018-07-28 21:34:06.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_inch.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,8 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_inch.3x,v 1.21 2018/07/28 21:34:06 tom Exp $
-+.\" $Id: curs_inch.3x,v 1.22 2019/11/30 21:06:30 tom Exp $
- .TH curs_inch 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -68,7 +72,7 @@
- \fBA_COLOR\fR	Bit-mask to extract color-pair field information
- .TE
- .SH RETURN VALUE
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .PP
-Index: man/curs_ins_wch.3x
-Prereq:  1.6 
---- ncurses-6.1-20191123+/man/curs_ins_wch.3x	2017-11-21 00:53:44.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_ins_wch.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2002-2010,2017 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2002-2017,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_ins_wch.3x,v 1.6 2017/11/21 00:53:44 tom Exp $
-+.\" $Id: curs_ins_wch.3x,v 1.7 2019/11/30 21:06:30 tom Exp $
- .TH curs_ins_wch 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBins_wch\fR,
- \fBmvins_wch\fR,
-@@ -53,7 +57,7 @@
- If successful, these functions return \fBOK\fP.
- If not, they return \fBERR\fP.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH ERRORS
-Index: man/curs_ins_wstr.3x
-Prereq:  1.8 
---- ncurses-6.1-20191123+/man/curs_ins_wstr.3x	2017-11-21 00:53:44.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_ins_wstr.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2002-2012,2017 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2002-2017,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_ins_wstr.3x,v 1.8 2017/11/21 00:53:44 tom Exp $
-+.\" $Id: curs_ins_wstr.3x,v 1.9 2019/11/30 21:06:30 tom Exp $
- .TH curs_ins_wstr 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .na
- .hy 0
- .SH NAME
-@@ -96,7 +100,7 @@
- Upon successful completion, these functions return \fBOK\fP.
- Otherwise, they return \fBERR\fP.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH SEE ALSO
-Index: man/curs_insch.3x
-Prereq:  1.15 
---- ncurses-6.1-20191123+/man/curs_insch.3x	2018-07-28 21:34:56.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_insch.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_insch.3x,v 1.15 2018/07/28 21:34:56 tom Exp $
-+.\" $Id: curs_insch.3x,v 1.16 2019/11/30 21:06:30 tom Exp $
- .TH curs_insch 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBinsch\fR,
- \fBwinsch\fR,
-@@ -56,7 +60,7 @@
- upon successful completion,
- unless otherwise noted in the preceding routine descriptions.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH NOTES
-Index: man/curs_insstr.3x
-Prereq:  1.22 
---- ncurses-6.1-20191123+/man/curs_insstr.3x	2017-11-21 00:53:44.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_insstr.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2017,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_insstr.3x,v 1.22 2017/11/21 00:53:44 tom Exp $
-+.\" $Id: curs_insstr.3x,v 1.23 2019/11/30 21:06:30 tom Exp $
- .TH curs_insstr 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBinsstr\fR,
- \fBinsnstr\fR,
-@@ -80,7 +84,7 @@
- if the window parameter is null or the str parameter is null,
- an error is returned.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH NOTES
-Index: man/curs_inwstr.3x
-Prereq:  1.11 
---- ncurses-6.1-20191123+/man/curs_inwstr.3x	2018-07-28 22:19:56.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_inwstr.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2002-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2002-2018,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_inwstr.3x,v 1.11 2018/07/28 22:19:56 tom Exp $
-+.\" $Id: curs_inwstr.3x,v 1.12 2019/11/30 21:06:30 tom Exp $
- .TH curs_inwstr 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBinwstr\fR,
- \fBinnwstr\fR,
-@@ -92,7 +96,7 @@
- routines return the
- number of characters read into the string.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH SEE ALSO
-Index: man/curs_kernel.3x
-Prereq:  1.26 
---- ncurses-6.1-20191123+/man/curs_kernel.3x	2018-07-28 23:04:00.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_kernel.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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_kernel.3x,v 1.26 2018/07/28 23:04:00 tom Exp $
-+.\" $Id: curs_kernel.3x,v 1.27 2019/11/30 21:06:30 tom Exp $
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
- .ie \n(.g .ds '' \(rq
-@@ -84,7 +84,7 @@
- .SS def_prog_mode, def_shell_mode
- .PP
- The \fBdef_prog_mode\fR and \fBdef_shell_mode\fR routines save the
--current terminal modes as the "program" (in \fBcurses\fR) or "shell"
-+current terminal modes as the \*(``program\*('' (in \fBcurses\fR) or \*(``shell\*(''
- (not in \fBcurses\fR) state for use by the \fBreset_prog_mode\fR and
- \fBreset_shell_mode\fR routines.
- This is done automatically by \fBinitscr\fR.
-@@ -93,7 +93,7 @@
- .SS reset_prog_mode, reset_shell_mode
- .PP
- The \fBreset_prog_mode\fR and \fBreset_shell_mode\fR routines restore
--the terminal to "program" (in \fBcurses\fR) or "shell" (out of
-+the terminal to \*(``program\*('' (in \fBcurses\fR) or \*(``shell\*('' (out of
- \fBcurses\fR) state.
- These are done automatically by \fBendwin\fR(3X) and,
- after an \fBendwin\fR, by \fBdoupdate\fR,
-Index: man/curs_printw.3x
-Prereq:  1.23 
---- ncurses-6.1-20191123+/man/curs_printw.3x	2018-07-28 21:14:06.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_printw.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_printw.3x,v 1.23 2018/07/28 21:14:06 tom Exp $
-+.\" $Id: curs_printw.3x,v 1.24 2019/11/30 21:06:30 tom Exp $
- .TH curs_printw 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -81,7 +85,7 @@
- buffer used to format the results.
- It will return an error if the window pointer is null.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH PORTABILITY
-Index: man/curs_refresh.3x
-Prereq:  1.19 
---- ncurses-6.1-20191123+/man/curs_refresh.3x	2018-07-28 22:59:02.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_refresh.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2016,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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_refresh.3x,v 1.19 2018/07/28 22:59:02 tom Exp $
-+.\" $Id: curs_refresh.3x,v 1.20 2019/11/30 21:06:30 tom Exp $
- .TH curs_refresh 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -109,7 +109,8 @@
- (i.e., the global variable \fBcurscr\fR),
- the screen is immediately cleared and repainted from scratch.
- .PP
--The phrase \*(``copies the named window to the virtual screen\*('' above is ambiguous.
-+The phrase \*(``copies the named window
-+to the virtual screen\*('' above is ambiguous.
- What actually happens is that all \fItouched\fR (changed) lines in the window
- are copied to the virtual screen.
- This affects programs that use overlapping
-Index: man/curs_scanw.3x
-Prereq:  1.24 
---- ncurses-6.1-20191123+/man/curs_scanw.3x	2018-07-28 21:14:06.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_scanw.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_scanw.3x,v 1.24 2018/07/28 21:14:06 tom Exp $
-+.\" $Id: curs_scanw.3x,v 1.25 2019/11/30 21:06:30 tom Exp $
- .TH curs_scanw 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -75,7 +79,7 @@
- \fBmvscanw\fR and \fBmvwscanw\fR routines to determine the number of fields
- which were mapped in the call.
- .PP
--Functions with a "mv" prefix first perform a cursor movement using
-+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
- \fBwmove\fP, and return an error if the position is outside the window,
- or if the window pointer is null.
- .SH PORTABILITY
-Index: man/curs_scr_dump.3x
-Prereq:  1.13 
---- ncurses-6.1-20191123+/man/curs_scr_dump.3x	2018-07-28 22:50:26.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_scr_dump.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_scr_dump.3x,v 1.13 2018/07/28 22:50:26 tom Exp $
-+.\" $Id: curs_scr_dump.3x,v 1.14 2019/11/30 21:06:30 tom Exp $
- .TH curs_scr_dump 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -100,7 +104,7 @@
- .PP
- The SVr4 docs merely say under \fBscr_init\fR that the dump data is also
- considered invalid "if the time-stamp of the tty is old" but do not define
--"old".
-+\*(``old\*(''.
- .SH SEE ALSO
- \fBcurses\fR(3X),
- \fBcurs_initscr\fR(3X),
-Index: man/curs_scroll.3x
-Prereq:  1.16 
---- ncurses-6.1-20191123+/man/curs_scroll.3x	2018-07-28 22:59:02.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_scroll.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2010,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_scroll.3x,v 1.16 2018/07/28 22:59:02 tom Exp $
-+.\" $Id: curs_scroll.3x,v 1.17 2019/11/30 21:06:30 tom Exp $
- .TH curs_scroll 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .na
- .hy 0
- .SH NAME
-@@ -74,8 +78,8 @@
- Note that \fBscrl\fR and \fBscroll\fR may be macros.
- .PP
- The SVr4 documentation says that the optimization of physically scrolling
--immediately if the scroll region is the entire screen "is" performed, not
--"may be" performed.
-+immediately if the scroll region is the entire screen \*(``is\*('' performed, not
-+\*(``may be\*('' performed.
- This implementation deliberately does not guarantee
- that this will occur, to leave open the possibility of smarter
- optimization of multiple scroll actions on the next update.
-Index: man/curs_sp_funcs.3x
-Prereq:  1.16 
---- ncurses-6.1-20191123+/man/curs_sp_funcs.3x	2019-04-13 16:41:08.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_sp_funcs.3x	2019-11-30 21:01:26.000000000 +0000
-@@ -26,8 +26,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_sp_funcs.3x,v 1.16 2019/04/13 16:41:08 tom Exp $
-+.\" $Id: curs_sp_funcs.3x,v 1.17 2019/11/30 21:01:26 tom Exp $
- .TH curs_sp_funcs 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .na
- .hy 0
- .SH NAME
-@@ -349,7 +353,7 @@
- NCURSES_SP_NAME
- The new functions are named using the macro \fINCURSES_SP_NAME\fP,
- which hides the actual implementation.
--Currently this adds a "_sp" suffix to the name of the unextended function.
-+Currently this adds a \*(``_sp\*('' suffix to the name of the unextended function.
- This manual page indexes the extensions showing the full name.
- However the proper usage of these functions uses the macro,
- to provide for the possibility of changing the naming convention
-Index: man/curs_termcap.3x
-Prereq:  1.41 
---- ncurses-6.1-20191123+/man/curs_termcap.3x	2019-03-23 21:51:12.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_termcap.3x	2019-11-30 21:01:40.000000000 +0000
-@@ -26,8 +26,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_termcap.3x,v 1.41 2019/03/23 21:51:12 tom Exp $
-+.\" $Id: curs_termcap.3x,v 1.42 2019/11/30 21:01:40 tom Exp $
- .TH curs_termcap 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -213,7 +217,7 @@
- appear to be terminfo).
- .PP
- Because terminfo conventions for representing padding in string capabilities
--differ from termcap's, \fBtputs("50");\fR will put out a literal "50" rather
-+differ from termcap's, \fBtputs("50");\fR will put out a literal \*(``50\*('' rather
- than busy-waiting for 50 milliseconds.
- Cope with it.
- .PP
-Index: man/curs_util.3x
-Prereq:  1.55 
---- ncurses-6.1-20191123+/man/curs_util.3x	2019-03-23 21:51:12.000000000 +0000
-+++ ncurses-6.1-20191130/man/curs_util.3x	2019-11-30 21:04:02.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_util.3x,v 1.55 2019/03/23 21:51:12 tom Exp $
-+.\" $Id: curs_util.3x,v 1.56 2019/11/30 21:04:02 tom Exp $
- .TH curs_util 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -114,8 +114,8 @@
- .bP
- Otherwise (if there is no corresponding name) the function returns null,
- to denote an error.
--X/Open also lists an "UNKNOWN KEY" return value, which some implementations
--return rather than null.
-+X/Open also lists an \*(``UNKNOWN KEY\*('' return value,
-+which some implementations return rather than null.
- .LP
- The corresponding \fBkey_name\fR returns a character string corresponding
- to the wide-character value \fIw\fR.
-@@ -289,7 +289,7 @@
- string capabilities which are defined in the terminfo entry via the \fB\-x\fP
- option of \fB@TIC@\fP.
- This implementation automatically assigns at run-time keycodes to
--user-defined strings which begin with "k".
-+user-defined strings which begin with \*(``k\*(''.
- The keycodes start at KEY_MAX, but are not guaranteed to be
- the same value for different runs because user-defined codes are
- merged from all terminal descriptions which have been loaded.
-Index: man/default_colors.3x
-Prereq:  1.27 
---- ncurses-6.1-20191123+/man/default_colors.3x	2018-07-28 22:08:59.000000000 +0000
-+++ ncurses-6.1-20191130/man/default_colors.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2016,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,12 @@
- .\"
- .\" Author: Thomas E. Dickey 1997,1999,2000,2005
- .\"
--.\" $Id: default_colors.3x,v 1.27 2018/07/28 22:08:59 tom Exp $
-+.\" $Id: default_colors.3x,v 1.28 2019/11/30 21:06:30 tom Exp $
- .TH default_colors 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBuse_default_colors\fR,
- \fBassume_default_colors\fR \- use terminal's default colors
-@@ -52,7 +56,7 @@
- using colors only for text.
- For example, there are several implementations of the \fBls\fP program
- which use colors to denote different file types or permissions.
--These "color ls" programs do not necessarily modify the background color,
-+These \*(``color ls\*('' programs do not necessarily modify the background color,
- typically using only the \fBsetaf\fP terminfo capability to set the
- foreground color.
- Full-screen applications that use default colors can achieve similar
-@@ -111,7 +115,7 @@
- The bottom portion of the screen, which is of adjustable
- size, is left uncolored to display the results from shell commands.
- The top portion of the screen colors filenames using a scheme like the
--"color ls" programs.
-+\*(``color ls\*('' programs.
- Attempting to manage the background color of the screen for this application
- would give unsatisfactory results for a variety of reasons.
- This extension was devised after
-Index: man/form.3x
-Prereq:  1.32 
---- ncurses-6.1-20191123+/man/form.3x	2019-01-20 20:31:42.000000000 +0000
-+++ ncurses-6.1-20191130/man/form.3x	2019-11-30 20:51:36.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form.3x,v 1.32 2019/01/20 20:31:42 tom Exp $
-+.\" $Id: form.3x,v 1.33 2019/11/30 20:51:36 tom Exp $
- .TH form 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -234,7 +234,7 @@
- Manual pages and adaptation for ncurses by Eric
- S. Raymond.
- .SH SEE ALSO
--\fBcurses\fR(3X) and related pages whose names begin "form_" for detailed
-+\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
- descriptions of the entry points.
- .PP
- This describes \fBncurses\fR
-Index: man/form_field_attributes.3x
-Prereq:  1.14 
---- ncurses-6.1-20191123+/man/form_field_attributes.3x	2019-01-20 20:31:42.000000000 +0000
-+++ ncurses-6.1-20191130/man/form_field_attributes.3x	2019-11-30 21:01:57.000000000 +0000
-@@ -27,8 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_attributes.3x,v 1.14 2019/01/20 20:31:42 tom Exp $
-+.\" $Id: form_field_attributes.3x,v 1.15 2019/11/30 21:01:57 tom Exp $
- .TH form_field_attributes 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBform_field_attributes\fR \- color and attribute control for form fields
- .SH SYNOPSIS
-@@ -77,7 +81,7 @@
- System error occurred (see \fBerrno\fR(3)).
- .
- .SH SEE ALSO
--\fBcurses\fR(3X) and related pages whose names begin "form_" for detailed
-+\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
- descriptions of the entry points.
- .SH NOTES
- The header file \fB\fR automatically includes the header file
-Index: man/form_field_buffer.3x
-Prereq:  1.23 
---- ncurses-6.1-20191123+/man/form_field_buffer.3x	2019-01-20 20:19:03.000000000 +0000
-+++ ncurses-6.1-20191130/man/form_field_buffer.3x	2019-11-30 21:02:22.000000000 +0000
-@@ -27,8 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_buffer.3x,v 1.23 2019/01/20 20:19:03 tom Exp $
-+.\" $Id: form_field_buffer.3x,v 1.24 2019/11/30 21:02:22 tom Exp $
- .TH form_field_buffer 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -115,7 +119,7 @@
- .B E_BAD_ARGUMENT
- Routine detected an incorrect or out-of-range argument.
- .SH SEE ALSO
--\fBcurses\fR(3X) and related pages whose names begin "form_" for detailed
-+\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
- descriptions of the entry points.
- .SH NOTES
- The header file \fB\fR automatically includes the header file
-Index: man/form_field_info.3x
-Prereq:  1.15 
---- ncurses-6.1-20191123+/man/form_field_info.3x	2019-01-20 20:31:42.000000000 +0000
-+++ ncurses-6.1-20191130/man/form_field_info.3x	2019-11-30 21:02:29.000000000 +0000
-@@ -27,8 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_info.3x,v 1.15 2019/01/20 20:31:42 tom Exp $
-+.\" $Id: form_field_info.3x,v 1.16 2019/11/30 21:02:29 tom Exp $
- .TH form_field_info 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBdynamic_field_info\fP,
- \fBfield_info\fR \- retrieve field characteristics
-@@ -65,7 +69,7 @@
- .B E_BAD_ARGUMENT
- Routine detected an incorrect or out-of-range argument.
- .SH SEE ALSO
--\fBcurses\fR(3X) and related pages whose names begin "form_" for detailed
-+\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
- descriptions of the entry points.
- .SH NOTES
- The header file \fB\fR automatically includes the header file
-Index: man/form_field_just.3x
-Prereq:  1.14 
---- ncurses-6.1-20191123+/man/form_field_just.3x	2019-01-20 20:31:42.000000000 +0000
-+++ ncurses-6.1-20191130/man/form_field_just.3x	2019-11-30 21:02:36.000000000 +0000
-@@ -27,8 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_just.3x,v 1.14 2019/01/20 20:31:42 tom Exp $
-+.\" $Id: form_field_just.3x,v 1.15 2019/11/30 21:02:36 tom Exp $
- .TH form_field_just 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBset_field_just\fR,
- \fBfield_just\fP \- retrieve field characteristics
-@@ -60,7 +64,7 @@
- .B E_BAD_ARGUMENT
- Routine detected an incorrect or out-of-range argument.
- .SH SEE ALSO
--\fBcurses\fR(3X) and related pages whose names begin "form_" for detailed
-+\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
- descriptions of the entry points.
- .SH NOTES
- The header file \fB\fR automatically includes the header file
-Index: man/form_new_page.3x
-Prereq:  1.13 
---- ncurses-6.1-20191123+/man/form_new_page.3x	2018-07-28 21:20:04.000000000 +0000
-+++ ncurses-6.1-20191130/man/form_new_page.3x	2019-11-30 21:06:30.000000000 +0000
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2015,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2019 Free 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,8 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_new_page.3x,v 1.13 2018/07/28 21:20:04 tom Exp $
-+.\" $Id: form_new_page.3x,v 1.14 2019/11/30 21:06:30 tom Exp $
- .TH form_new_page 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBset_new_page\fR,
- \fBnew_page\fR \- form pagination functions
-@@ -56,7 +60,7 @@
- .B E_CONNECTED
- The given field is already connected to a form.
- .SH SEE ALSO
--\fBcurses\fR(3X) and related pages whose names begin "form_" for detailed
-+\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
- descriptions of the entry points.
- .SH NOTES
- The header file \fB\fR automatically includes the header file
-Index: man/menu_attributes.3x
-Prereq:  1.15 
---- ncurses-6.1-20191123+/man/menu_attributes.3x	2019-01-20 20:32:23.000000000 +0000
-+++ ncurses-6.1-20191130/man/menu_attributes.3x	2019-11-30 21:02:51.000000000 +0000
-@@ -27,8 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_attributes.3x,v 1.15 2019/01/20 20:32:23 tom Exp $
-+.\" $Id: menu_attributes.3x,v 1.16 2019/11/30 21:02:51 tom Exp $
- .TH menu_attributes 3X ""
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .SH NAME
- \fBmenu_back\fR,
- \fBmenu_fore\fR,
-@@ -94,7 +98,7 @@
- .B E_BAD_ARGUMENT
- Routine detected an incorrect or out-of-range argument.
- .SH SEE ALSO
--\fBcurses\fR(3X) and related pages whose names begin "menu_" for detailed
-+\fBcurses\fR(3X) and related pages whose names begin \*(``menu_\*('' for detailed
- descriptions of the entry points.
- .SH NOTES
- The header file \fB\fR automatically includes the header file
-Index: man/ncurses.3x
-Prereq:  1.141 
---- ncurses-6.1-20191123+/man/ncurses.3x	2019-02-16 15:07:20.000000000 +0000
-+++ ncurses-6.1-20191130/man/ncurses.3x	2019-11-30 20:47:07.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: ncurses.3x,v 1.141 2019/02/16 15:07:20 tom Exp $
-+.\" $Id: ncurses.3x,v 1.143 2019/11/30 20:47:07 tom Exp $
- .hy 0
- .TH ncurses 3X ""
- .ie \n(.g .ds `` \(lq
-@@ -267,7 +267,7 @@
- .RS 3
- .TP 5
- .I ncurses
--the "normal" library, which handles 8-bit characters.
-+the \*(``normal\*('' library, which handles 8-bit characters.
- The normal (8-bit) library stores characters combined with attributes
- in \fBchtype\fP data.
- .IP
-@@ -278,9 +278,10 @@
- Each cell (row and column) in a \fBWINDOW\fP is stored as a \fBchtype\fP.
- .TP 5
- .I ncursesw
--the so-called "wide" library, which handles multibyte characters
-+the so-called \*(``wide\*('' library, which handles multibyte characters
- (see the section on \fBALTERNATE CONFIGURATIONS\fP).
--The "wide" library includes all of the calls from the "normal" library.
-+The \*(``wide\*('' library includes all of the calls
-+from the \*(``normal\*('' library.
- It adds about one third more calls using data types which store
- multibyte characters:
- .RS 5
-@@ -294,9 +295,13 @@
- The video attributes and color are stored in separate fields of the structure.
- .IP
- Each cell (row and column) in a \fBWINDOW\fP is stored as a \fBcchar_t\fP.
-+.IP
-+The \fBsetcchar\fP(3X) and \fBgetcchar\fP(3X)
-+functions store and retrieve the data from
-+a \fBcchar_t\fP structure.
- .TP 5
- .B wchar_t
--stores a "wide" character.
-+stores a \*(``wide\*('' character.
- Like \fBchtype\fP, this may be an integer.
- .TP 5
- .B wint_t
-@@ -304,10 +309,10 @@
- the same size.
- .RE
- .IP
--The "wide" library provides new functions which are analogous to
--functions in the "normal" library.
-+The \*(``wide\*('' library provides new functions which are analogous to
-+functions in the \*(``normal\*('' library.
- There is a naming convention which relates many of the normal/wide variants:
--a "_w" is inserted into the name.
-+a \*(``_w\*('' is inserted into the name.
- For example, \fBwaddch\fP becomes \fBwadd_wch\fP.
- .RE
- .PP
-@@ -928,7 +933,7 @@
- using the built-in support for xterm, etc.
- .PP
- If the environment variable is absent,
--ncurses will attempt to open GPM if \fBTERM\fP contains "linux".
-+ncurses will attempt to open GPM if \fBTERM\fP contains \*(``linux\*(''.
- .SS NCURSES_NO_HARD_TABS
- .PP
- \fBNcurses\fP may use tabs as part of the cursor movement optimization.
-@@ -945,7 +950,7 @@
- .SS NCURSES_NO_PADDING
- .PP
- Most of the terminal descriptions in the terminfo database are written
--for real "hardware" terminals.
-+for real \*(``hardware\*('' terminals.
- Many people use terminal emulators
- which run in a windowing environment and use curses-based applications.
- Terminal emulators can duplicate
-@@ -1019,7 +1024,7 @@
- .PP
- When setting this variable, you should set it to a nonzero value.
- Setting it to zero (or to a nonnumber)
--disables the special check for "linux" and "screen".
-+disables the special check for \*(``linux\*('' and \*(``screen\*(''.
- .PP
- As an alternative to the environment variable,
- ncurses checks for an extended terminfo capability \fBU8\fP.
-@@ -1041,7 +1046,7 @@
- .ft
- .RE
- .PP
--The name "U8" is chosen to be two characters,
-+The name \*(``U8\*('' is chosen to be two characters,
- to permit it to be used by applications that use ncurses'
- termcap interface.
- .SS NCURSES_TRACE
-@@ -1217,7 +1222,7 @@
- The configure script renames the library and
- (if the \fB\-\-disable\-overwrite\fP option is used)
- puts the header files in a different subdirectory.
--All of the library names have a "w" appended to them,
-+All of the library names have a \*(``w\*('' appended to them,
- i.e., instead of
- .NS
- \fB\-lncurses\fR
-@@ -1263,8 +1268,8 @@
- .TP 5
- \-\-with\-pthread
- The configure script renames the library.
--All of the library names have a "t" appended to them
--(before any "w" added by \fB\-\-enable\-widec\fP).
-+All of the library names have a \*(``t\*('' appended to them
-+(before any \*(``w\*('' added by \fB\-\-enable\-widec\fP).
- .IP
- The global variables such as \fBLINES\fP are replaced by macros to
- allow read-only access.
-@@ -1280,8 +1285,8 @@
- \-\-with\-profile
- The shared and normal (static) library names differ by their suffixes,
- e.g., \fBlibncurses.so\fP and \fBlibncurses.a\fP.
--The debug and profiling libraries add a "_g" and a "_p" to the root
--names respectively,
-+The debug and profiling libraries add a \*(``_g\*(''
-+and a \*(``_p\*('' to the root names respectively,
- e.g., \fBlibncurses_g.a\fP and \fBlibncurses_p.a\fP.
- .TP 5
- \-\-with\-trace
-@@ -1297,7 +1302,7 @@
- terminal capability database
- .SH SEE ALSO
- \fBterminfo\fR(\*n) and related pages whose names begin
--"curs_" for detailed routine descriptions.
-+\*(``curs_\*('' for detailed routine descriptions.
- .br
- \fBcurs_variables\fR(3X)
- .br
-Index: man/term_variables.3x
-Prereq:  1.10 
---- ncurses-6.1-20191123+/man/term_variables.3x	2019-03-23 21:51:12.000000000 +0000
-+++ ncurses-6.1-20191130/man/term_variables.3x	2019-11-30 20:51:36.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: term_variables.3x,v 1.10 2019/03/23 21:51:12 tom Exp $
-+.\" $Id: term_variables.3x,v 1.11 2019/11/30 20:51:36 tom Exp $
- .TH term_variables 3X ""
- .ds n 5
- .ie \n(.g .ds `` \(lq
-@@ -101,7 +101,7 @@
- with the \fBA_ALTCHARSET\fP video attribute into line-drawing characters.
- .PP
- The encoding of the information in this array has changed periodically.
--Application developers need only know that it is used for the "ACS_"
-+Application developers need only know that it is used for the \*(``ACS_\*(''
- constants in .
- .PP
- The comparable data for the wide-character library is a private variable.
-@@ -123,7 +123,7 @@
- although the hash-tables used by
- the terminfo and termcap functions are not available.
- .PP
--The long terminfo capability names use a "l" (ell) in their names:
-+The long terminfo capability names use a \*(``l\*('' (ell) in their names:
- \fBboolfnames\fP,
- \fBnumfnames\fP, and
- \fBstrfnames\fP.
-Index: man/terminfo.tail
-Prereq:  1.97 
---- ncurses-6.1-20191123+/man/terminfo.tail	2019-07-20 10:20:57.000000000 +0000
-+++ ncurses-6.1-20191130/man/terminfo.tail	2019-11-30 20:54:32.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: terminfo.tail,v 1.97 2019/07/20 10:20:57 tom Exp $
-+.\" $Id: terminfo.tail,v 1.98 2019/11/30 20:54:32 tom Exp $
- .ps +1
- .SS User-Defined Capabilities
- .
-@@ -478,7 +478,7 @@
- \fB%g\fP\fI[A\-Z]\fP
- get static variable \fI[a\-z]\fP and push it
- .IP
--The terms "static" and "dynamic" are misleading.
-+The terms \*(``static\*('' and \*(``dynamic\*('' are misleading.
- Historically, these are simply two different sets of variables,
- whose values are not reset between calls to \fBtparm\fP(3X).
- However, that fact is not documented in other implementations.
-@@ -1763,14 +1763,14 @@
- the recommended 1K for the termcap entry; others do not.
- .PP
- Each termcap entry has two important sizes associated with it: before
--"tc" expansion, and after "tc" expansion.
--"tc" is the capability that
-+\*(``tc\*('' expansion, and after \*(``tc\*('' expansion.
-+\*(``tc\*('' is the capability that
- tacks on another termcap entry to the end of the current one, to add
- on its capabilities.
--If a termcap entry does not use the "tc"
-+If a termcap entry does not use the \*(``tc\*(''
- capability, then of course the two lengths are the same.
- .PP
--The "before tc expansion" length is the most important one, because it
-+The \*(``before tc expansion\*('' length is the most important one, because it
- affects more than just users of that particular terminal.
- This is the
- length of the entry as it exists in /etc/termcap, minus the
-@@ -1802,16 +1802,16 @@
- termcap library truncates long entries, like OSF/1 3.0, it is immune to dying
- here but will return incorrect data for the terminal.
- .PP
--The "after tc expansion" length will have a similar effect to the
-+The \*(``after tc expansion\*('' length will have a similar effect to the
- above, but only for people who actually set TERM to that terminal
--type, since \fBtgetent\fP only does "tc" expansion once it is found the
-+type, since \fBtgetent\fP only does \*(``tc\*('' expansion once it is found the
- terminal type it was looking for, not while searching.
- .PP
- In summary, a termcap entry that is longer than 1023 bytes can cause,
- on various combinations of termcap libraries and applications, a core
- dump, warnings, or incorrect operation.
- If it is too long even before
--"tc" expansion, it will have this effect even for users of some other
-+\*(``tc\*('' expansion, it will have this effect even for users of some other
- terminal types and users whose TERM variable does not have a termcap
- entry.
- .PP
-Index: man/tic.1m
-Prereq:  1.75 
---- ncurses-6.1-20191123+/man/tic.1m	2019-10-12 20:56:38.000000000 +0000
-+++ ncurses-6.1-20191130/man/tic.1m	2019-11-30 20:51:55.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tic.1m,v 1.75 2019/10/12 20:56:38 tom Exp $
-+.\" $Id: tic.1m,v 1.76 2019/11/30 20:51:55 tom Exp $
- .TH @TIC@ 1M ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -98,7 +98,7 @@
- .PP
- In either case (directory or hashed database),
- \fB@TIC@\fP will create the container if it does not exist.
--For a directory, this would be the "terminfo" leaf,
-+For a directory, this would be the \*(``terminfo\*('' leaf,
- versus a "terminfo.db" file.
- .PP
- The results are normally placed in the system terminfo database \fB\*d\fR.
-@@ -282,7 +282,7 @@
- the full set of SVR4/XSI Curses terminfo; and outright broken ports like AIX 3.x
- that have their own extensions incompatible with SVr4/XSI.
- Available subsets
--are "SVr1", "Ultrix", "HP", "BSD" and "AIX";
-+are \*(``SVr1\*('', \*(``Ultrix\*('', \*(``HP\*('', \*(``BSD\*('' and \*(``AIX\*('';
- see \fBterminfo\fR(\*n) for details.
- .TP
- \fB\-r\fR
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20191123+/package/debian-mingw/changelog	2019-11-23 15:45:17.000000000 +0000
-+++ ncurses-6.1-20191130/package/debian-mingw/changelog	2019-11-30 14:52:31.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191123) unstable; urgency=low
-+ncurses6 (6.1+20191130) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 23 Nov 2019 10:45:17 -0500
-+ -- Thomas E. Dickey   Sat, 30 Nov 2019 09:52:31 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20191123+/package/debian-mingw64/changelog	2019-11-23 15:45:17.000000000 +0000
-+++ ncurses-6.1-20191130/package/debian-mingw64/changelog	2019-11-30 14:52:31.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191123) unstable; urgency=low
-+ncurses6 (6.1+20191130) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 23 Nov 2019 10:45:17 -0500
-+ -- Thomas E. Dickey   Sat, 30 Nov 2019 09:52:31 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20191123+/package/debian/changelog	2019-11-23 15:45:17.000000000 +0000
-+++ ncurses-6.1-20191130/package/debian/changelog	2019-11-30 14:52:31.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191123) unstable; urgency=low
-+ncurses6 (6.1+20191130) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 23 Nov 2019 10:45:17 -0500
-+ -- Thomas E. Dickey   Sat, 30 Nov 2019 09:52:31 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.362 
---- ncurses-6.1-20191123+/package/mingw-ncurses.nsi	2019-11-23 15:45:17.000000000 +0000
-+++ ncurses-6.1-20191130/package/mingw-ncurses.nsi	2019-11-30 14:52:31.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.362 2019/11/23 15:45:17 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.363 2019/11/30 14:52:31 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "1123"
-+!define VERSION_MMDD  "1130"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20191123+/package/mingw-ncurses.spec	2019-11-24 01:54:24.000000000 +0000
-+++ ncurses-6.1-20191130/package/mingw-ncurses.spec	2019-11-30 14:52:31.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20191123
-+Release: 20191130
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20191123+/package/ncurses.spec	2019-11-23 21:14:34.000000000 +0000
-+++ ncurses-6.1-20191130/package/ncurses.spec	2019-11-30 14:52:31.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20191123
-+Release: 20191130
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20191123+/package/ncursest.spec	2019-11-23 21:14:52.000000000 +0000
-+++ ncurses-6.1-20191130/package/ncursest.spec	2019-11-30 14:52:31.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20191123
-+Release: 20191130
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.1-20191207.patch b/ncurses-6.1-20191207.patch
deleted file mode 100644
index bf2a6da..0000000
--- a/ncurses-6.1-20191207.patch
+++ /dev/null
@@ -1,1686 +0,0 @@
-# ncurses 6.1 - patch 20191207 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191207.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Dec  8 02:13:02 UTC 2019
-# ------------------------------------------------------------------------------
-# Ada95/package/debian/compat           |    2 
-# Ada95/package/debian/control          |    2 
-# NEWS                                  |    6 +
-# VERSION                               |    2 
-# dist.mk                               |    4 
-# doc/html/man/adacurses6-config.1.html |    2 
-# doc/html/man/captoinfo.1m.html        |    2 
-# doc/html/man/clear.1.html             |    2 
-# doc/html/man/curs_trace.3x.html       |  141 +++++++++++++++++++++-----------
-# doc/html/man/form.3x.html             |    2 
-# doc/html/man/infocmp.1m.html          |    2 
-# doc/html/man/infotocap.1m.html        |    2 
-# doc/html/man/menu.3x.html             |    2 
-# doc/html/man/ncurses.3x.html          |    2 
-# doc/html/man/ncurses6-config.1.html   |    2 
-# doc/html/man/panel.3x.html            |    2 
-# doc/html/man/tabs.1.html              |    2 
-# doc/html/man/terminfo.5.html          |    2 
-# doc/html/man/tic.1m.html              |    2 
-# doc/html/man/toe.1m.html              |    2 
-# doc/html/man/tput.1.html              |    2 
-# doc/html/man/tset.1.html              |    2 
-# include/curses.tail                   |    5 -
-# include/term_entry.h                  |    6 -
-# include/tic.h                         |    4 
-# man/curs_trace.3x                     |  113 +++++++++++++++++++------
-# ncurses/base/lib_freeall.c            |    6 -
-# ncurses/curses.priv.h                 |    4 
-# ncurses/tinfo/entries.c               |    4 
-# ncurses/trace/lib_trace.c             |   22 ++++
-# package/debian-mingw/changelog        |    4 
-# package/debian-mingw/compat           |    2 
-# package/debian-mingw64/changelog      |    4 
-# package/debian-mingw64/compat         |    2 
-# package/debian/changelog              |    4 
-# package/debian/compat                 |    2 
-# package/mingw-ncurses.nsi             |    4 
-# package/mingw-ncurses.spec            |    2 
-# package/ncurses.map                   |    3 
-# package/ncurses.spec                  |    2 
-# package/ncurses.sym                   |    3 
-# package/ncursest.map                  |    3 
-# package/ncursest.spec                 |    2 
-# package/ncursest.sym                  |    3 
-# package/ncursestw.map                 |    3 
-# package/ncursestw.sym                 |    3 
-# package/ncursesw.map                  |    3 
-# package/ncursesw.sym                  |    3 
-# test/demo_menus.c                     |    8 -
-# test/hashtest.c                       |    6 -
-# test/lrtest.c                         |    8 -
-# test/ncurses.c                        |   15 +--
-# test/package/debian-mingw/compat      |    2 
-# test/package/debian-mingw/control     |    2 
-# test/package/debian-mingw64/compat    |    2 
-# test/package/debian-mingw64/control   |    2 
-# test/package/debian/compat            |    2 
-# test/package/debian/control           |    4 
-# test/padview.c                        |    6 -
-# test/test.priv.h                      |    8 -
-# test/testcurs.c                       |    4 
-# test/testscanw.c                      |    6 -
-# test/view.c                           |   17 ++-
-# test/worm.c                           |    8 -
-# 64 files changed, 319 insertions(+), 186 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/package/debian/compat
---- ncurses-6.1-20191130+/Ada95/package/debian/compat	2018-01-13 20:21:09.000000000 +0000
-+++ ncurses-6.1-20191207/Ada95/package/debian/compat	2019-12-07 23:33:48.000000000 +0000
-@@ -1 +1 @@
--7
-+9
-Index: Ada95/package/debian/control
---- ncurses-6.1-20191130+/Ada95/package/debian/control	2018-01-01 13:11:48.000000000 +0000
-+++ ncurses-6.1-20191207/Ada95/package/debian/control	2019-12-07 23:34:17.000000000 +0000
-@@ -9,7 +9,7 @@
- Package: adacurses
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: AdaCurses - Ada95 binding for ncurses
-+Description: Ada95 binding for ncurses
-  This package installs as "adacurses" to avoid conflict with other packages.
-  This is the Ada95 binding from the ncurses distribution.
-  .
-Index: NEWS
-Prereq:  1.3412 
---- ncurses-6.1-20191130+/NEWS	2019-11-30 22:27:28.000000000 +0000
-+++ ncurses-6.1-20191207/NEWS	2019-12-07 23:36:25.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3412 2019/11/30 22:27:28 tom Exp $
-+-- $Id: NEWS,v 1.3415 2019/12/07 23:36:25 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,10 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191207
-+	+ fix a few warnings for test-package builds
-+	+ add curses_trace(), to replace trace().
-+
- 20191130
- 	+ add portability section to curs_getcchar manpage (prompted by
- 	  discussion with Nick Black).
-Index: VERSION
---- ncurses-6.1-20191130+/VERSION	2019-11-30 14:52:31.000000000 +0000
-+++ ncurses-6.1-20191207/VERSION	2019-12-07 10:19:49.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191130
-+5:0:10	6.1	20191207
-Index: dist.mk
-Prereq:  1.1317 
---- ncurses-6.1-20191130+/dist.mk	2019-11-30 14:52:31.000000000 +0000
-+++ ncurses-6.1-20191207/dist.mk	2019-12-07 10:19:49.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1317 2019/11/30 14:52:31 tom Exp $
-+# $Id: dist.mk,v 1.1318 2019/12/07 10:19:49 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191130
-+NCURSES_PATCH = 20191207
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/adacurses6-config.1.html
---- ncurses-6.1-20191130+/doc/html/man/adacurses6-config.1.html	2019-11-30 22:44:57.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/adacurses6-config.1.html	2019-12-07 20:48:39.000000000 +0000
-@@ -125,7 +125,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20191130+/doc/html/man/captoinfo.1m.html	2019-11-30 22:44:57.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/captoinfo.1m.html	2019-12-07 20:48:39.000000000 +0000
-@@ -198,7 +198,7 @@
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/clear.1.html
---- ncurses-6.1-20191130+/doc/html/man/clear.1.html	2019-11-30 22:44:57.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/clear.1.html	2019-12-07 20:48:39.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
- 
-Index: doc/html/man/curs_trace.3x.html
---- ncurses-6.1-20191130+/doc/html/man/curs_trace.3x.html	2019-03-16 19:34:45.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/curs_trace.3x.html	2019-12-07 20:48:42.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -46,15 +46,15 @@
- 
- 
-

    NAME

    --       trace, _tracef, _traceattr, _traceattr2, _tracecchar_t, _tracecchar_t2,
--       _tracechar, _tracechtype, _tracechtype2, _nc_tracebits, _tracedump,
--       _tracemouse - curses debugging routines
-+       curses_trace, trace, _tracef, _traceattr, _traceattr2, _tracecchar_t,
-+       _tracecchar_t2, _tracechar, _tracechtype, _tracechtype2, _nc_tracebits,
-+       _tracedump, _tracemouse - curses debugging routines
- 
- 
-

    SYNOPSIS

    -        #include <curses.h>
- 
--       void trace(const unsigned int param);
-+       unsigned curses_trace(const unsigned param);
- 
-        void _tracef(const char *format, ...);
- 
-@@ -70,46 +70,64 @@
-        char *_nc_tracebits(void);
-        char *_tracemouse(const MEVENT *event);
- 
-+       /* deprecated */
-+       void trace(const unsigned int param);
-+
- 
-

    DESCRIPTION

    --       The  trace  routines  are  used for debugging the ncurses libraries, as
--       well as applications which use the ncurses libraries.  These  functions
--       are  normally available only with the debugging library e.g., libncurs-
--       es_g.a, but may be compiled into any model (shared, static, profile) by
--       defining  the  symbol  TRACE.   Additionally,  some  functions are only
--       available with the wide-character configuration of the libraries.
-+       The curses trace routines are used for debugging the ncurses libraries,
-+       as well as applications which use the ncurses libraries.  Some  limita-
-+       tions apply:
-+
-+       o   Aside from curses_trace, the other functions are normally available
-+           only with the debugging library e.g., libncurses_g.a.
-+
-+           All of the trace functions may be compiled into any model  (shared,
-+           static, profile) by defining the symbol TRACE.
-+
-+       o   Additionally,  the  functions  which use cchar_t are only available
-+           with the wide-character configuration of the libraries.
- 
- 
-

    Functions

    -        The principal parts of this interface are
- 
--       o   trace, which selectively enables different tracing features, and
-+       o   curses_trace, which selectively enables different tracing features,
-+           and
- 
-        o   _tracef, which writes formatted data to the trace file.
- 
--       Calling trace with a nonzero parameter creates the file  trace  in  the
--       current  directory  for output.  If the file already exists, no tracing
--       is done.
--
--       The other functions either return a pointer to a string-area (allocated
--       by the corresponding function), or return no value (such as _tracedump,
--       which implements the screen dump for TRACE_UPDATE).  The caller  should
--       not  free  these  strings, since the allocation is reused on successive
--       calls.  To work around the problem of a single  string-area  per  func-
--       tion,  some use a buffer-number parameter, telling the library to allo-
--       cate additional string-areas.
-+           The other functions either return a pointer to a string-area (allo-
-+           cated by the corresponding function), or return no value  (such  as
-+           _tracedump,  which  implements  the  screen dump for TRACE_UPDATE).
-+           The caller should not free these strings, since the  allocation  is
-+           reused on successive calls.  To work around the problem of a single
-+           string-area per  function,  some  use  a  buffer-number  parameter,
-+           telling the library to allocate additional string-areas.
-+
-+       The curses_trace function is always available, whether or not the other
-+       trace functions are available:
-+
-+       o   If tracing is available, calling curses_trace with a nonzero param-
-+           eter updates the trace mask, and returns the previous trace mask.
-+
-+           When the trace mask is nonzero, ncurses creates the file "trace" in
-+           the current directory for output.  If the file already  exists,  no
-+           tracing is done.
-+
-+       o   If tracing is not available, curses_trace returns zero (0).
- 
- 
-

    Trace Parameter

    --       The trace parameter is  formed  by  OR'ing  values  from  the  list  of
-+       The  trace  parameter  is  formed  by  OR'ing  values  from the list of
-        TRACE_xxx definitions in <curses.h>.  These include:
- 
-        TRACE_DISABLE
-             turn off tracing by passing a zero parameter.
- 
--            The  library flushes the output file, but retains an open file-de-
--            scriptor to the trace file so that it can resume tracing later  if
--            a nonzero parameter is passed to the trace function.
-+            The library flushes the output file, but retains an open  file-de-
-+            scriptor  to the trace file so that it can resume tracing later if
-+            a nonzero parameter is passed to the curses_trace function.
- 
-        TRACE_TIMES
-             trace user and system times of updates.
-@@ -127,11 +145,11 @@
-             trace all character outputs.
- 
-        TRACE_ORDINARY
--            trace  all  update  actions.   The old and new screen contents are
-+            trace all update actions.  The old and  new  screen  contents  are
-             written to the trace file for each refresh.
- 
-        TRACE_CALLS
--            trace all curses calls.  The parameters for each call are  traced,
-+            trace  all curses calls.  The parameters for each call are traced,
-             as well as return values.
- 
-        TRACE_VIRTPUT
-@@ -158,14 +176,14 @@
-        TRACE_MAXIMUM
-             maximum trace level, enables all of the separate trace features.
- 
--       Some  tracing  features  are  enabled  whenever  the trace parameter is
--       nonzero.  Some features overlap.  The specific  names  are  used  as  a
-+       Some tracing features are enabled whenever the  curses_trace  parameter
-+       is  nonzero.   Some features overlap.  The specific names are used as a
-        guideline.
- 
- 
-

    Initialization

    --       These  functions  check  the NCURSES_TRACE environment variable, to set
--       the tracing feature as if trace was called:
-+       These functions check the NCURSES_TRACE environment  variable,  to  set
-+       the tracing feature as if curses_trace was called:
- 
-            filter, initscr, new_prescr, newterm, nofilter, restartterm,
-            ripoffline, setupterm, slk_init, tgetent, use_env,
-@@ -173,38 +191,65 @@
- 
- 
-

    Command-line Utilities

    --       The command-line utilities such as  tic(1)  provide  a  verbose  option
--       which  extends  the  set  of messages written using the trace function.
--       Both of these (-v and trace) use the same variable (_nc_tracing), which
--       determines the messages which are written.
--
--       Because  the  command-line  utilities may call initialization functions
--       such as setupterm, tgetent or use_extended_names, some of their  debug-
--       ging  output may be directed to the trace file if the NCURSES_TRACE en-
-+       The  command-line  utilities  such  as  tic(1) provide a verbose option
-+       which extends the set of messages written using the curses_trace  func-
-+       tion.   Both  of  these  (-v  and  curses_trace)  use the same variable
-+       (_nc_tracing), which determines the messages which are written.
-+
-+       Because the command-line utilities may  call  initialization  functions
-+       such  as setupterm, tgetent or use_extended_names, some of their debug-
-+       ging output may be directed to the trace file if the NCURSES_TRACE  en-
-        vironment variable is set:
- 
-        o   messages produced in the utility are written to the standard error.
- 
-        o   messages produced by the underlying library are written to trace.
- 
--       If ncurses is built without tracing, none of the latter  are  produced,
-+       If  ncurses  is built without tracing, none of the latter are produced,
-        and fewer diagnostics are provided by the command-line utilities.
- 
- 
-

    RETURN VALUE

    --       Routines  which return a value are designed to be used as parameters to
-+       Routines which return a value are designed to be used as parameters  to
-        the _tracef routine.
- 
- 
-

    PORTABILITY

    --       These functions are not part of the XSI interface.  Some  other  curses
--       implementations  are  known to have similar, undocumented features, but
--       they are not compatible with ncurses.
-+       These  functions  are not part of the XSI interface.  Some other curses
-+       implementations are known to have similar features, but  they  are  not
-+       compatible with ncurses:
-+
-+       o   SVr4  provided  traceon  and traceoff, to control whether debugging
-+           information was written to the "trace" file.  While  the  functions
-+           were  always  available, this feature was only enabled if DEBUG was
-+           defined when building the library.
-+
-+           The SVr4 tracing feature is undocumented.
-+
-+       o   PDCurses provides traceon and traceoff, which (like SVr4)  are  al-
-+           ways  available, and enable tracing to the "trace" file only when a
-+           debug-library is built.
-+
-+           PDCurses has a short description of these functions,  with  a  note
-+           that  they are not present in X/Open Curses, ncurses or NetBSD.  It
-+           does not mention SVr4, but the functions'  inclusion  in  a  header
-+           file section labeled "Quasi-standard" hints at the origin.
-+
-+       o   NetBSD  does  not  provide functions for enabling/disabling traces.
-+           It  uses  environment   variables   CURSES_TRACE_MASK   and   CURS-
-+           ES_TRACE_FILE  to  determine  what is traced, and where the results
-+           are written.  This is available only when a debug-library is built.
- 
--       A few functions are not provided when symbol versioning is used:
-+           The NetBSD tracing feature is undocumented.
-+
-+       A few ncurses functions are not  provided  when  symbol  versioning  is
-+       used:
- 
-            _nc_tracebits, _tracedump, _tracemouse
- 
-+       The  original  trace routine was deprecated because it often conflicted
-+       with application names.
-+
- 
-

    SEE ALSO

    -        curses(3x).
-Index: doc/html/man/form.3x.html
---- ncurses-6.1-20191130+/doc/html/man/form.3x.html	2019-11-30 22:44:59.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/form.3x.html	2019-12-07 20:48:42.000000000 +0000
-@@ -246,7 +246,7 @@
-        curses(3x)  and  related  pages  whose names begin "form_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.1-20191130+/doc/html/man/infocmp.1m.html	2019-11-30 22:45:00.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/infocmp.1m.html	2019-12-07 20:48:43.000000000 +0000
-@@ -512,7 +512,7 @@
- 
-        https://invisible-island.net/ncurses/tctest.html
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/infotocap.1m.html
---- ncurses-6.1-20191130+/doc/html/man/infotocap.1m.html	2019-11-30 22:45:00.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/infotocap.1m.html	2019-12-07 20:48:43.000000000 +0000
-@@ -90,7 +90,7 @@
-

    SEE ALSO

    -        curses(3x), tic(1m), infocmp(1m), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/menu.3x.html
---- ncurses-6.1-20191130+/doc/html/man/menu.3x.html	2019-11-30 22:45:00.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/menu.3x.html	2019-12-07 20:48:44.000000000 +0000
-@@ -221,7 +221,7 @@
-        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-        descriptions of the entry points.
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.1-20191130+/doc/html/man/ncurses.3x.html	2019-11-30 22:45:01.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/ncurses.3x.html	2019-12-07 20:48:45.000000000 +0000
-@@ -59,7 +59,7 @@
-        method of updating  character  screens  with  reasonable  optimization.
-        This  implementation  is  "new  curses"  (ncurses)  and is the approved
-        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
-        The  ncurses  library emulates the curses library of System V Release 4
-        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-Index: doc/html/man/ncurses6-config.1.html
---- ncurses-6.1-20191130+/doc/html/man/ncurses6-config.1.html	2019-11-30 22:45:01.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/ncurses6-config.1.html	2019-12-07 20:48:45.000000000 +0000
-@@ -112,7 +112,7 @@
-

    SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
- 
-Index: doc/html/man/panel.3x.html
---- ncurses-6.1-20191130+/doc/html/man/panel.3x.html	2019-11-30 22:45:01.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/panel.3x.html	2019-12-07 20:48:45.000000000 +0000
-@@ -204,7 +204,7 @@
-

    SEE ALSO

    -        curses(3x), curs_variables(3x),
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/tabs.1.html
---- ncurses-6.1-20191130+/doc/html/man/tabs.1.html	2019-11-30 22:45:01.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/tabs.1.html	2019-12-07 20:48:45.000000000 +0000
-@@ -205,7 +205,7 @@
-

    SEE ALSO

    -        tset(1), infocmp(1m), curses(3x), terminfo(5).
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.1-20191130+/doc/html/man/terminfo.5.html	2019-11-30 22:45:01.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/terminfo.5.html	2019-12-07 20:48:45.000000000 +0000
-@@ -103,7 +103,7 @@
-        have, by specifying how to perform screen operations, and by specifying
-        padding requirements and initialization sequences.
- 
--       This manual describes ncurses version 6.1 (patch 20191130).
-+       This manual describes ncurses version 6.1 (patch 20191207).
- 
- 
-

    Terminfo Entry Syntax

    -Index: doc/html/man/tic.1m.html
---- ncurses-6.1-20191130+/doc/html/man/tic.1m.html	2019-11-30 22:45:01.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/tic.1m.html	2019-12-07 20:48:45.000000000 +0000
-@@ -460,7 +460,7 @@
-        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-        term(5).  terminfo(5).  user_caps(5).
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/toe.1m.html
---- ncurses-6.1-20191130+/doc/html/man/toe.1m.html	2019-11-30 22:45:01.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/toe.1m.html	2019-12-07 20:48:46.000000000 +0000
-@@ -170,7 +170,7 @@
-        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
-        minfo(5).
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.1-20191130+/doc/html/man/tput.1.html	2019-11-30 22:45:01.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/tput.1.html	2019-12-07 20:48:46.000000000 +0000
-@@ -522,7 +522,7 @@
-

    SEE ALSO

    -        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.1-20191130+/doc/html/man/tset.1.html	2019-11-30 22:45:01.000000000 +0000
-+++ ncurses-6.1-20191207/doc/html/man/tset.1.html	2019-12-07 20:48:46.000000000 +0000
-@@ -389,7 +389,7 @@
-        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
-        ttys(5), environ(7)
- 
--       This describes ncurses version 6.1 (patch 20191130).
-+       This describes ncurses version 6.1 (patch 20191207).
- 
- 
- 
-Index: include/curses.tail
-Prereq:  1.23 
---- ncurses-6.1-20191130+/include/curses.tail	2016-02-13 16:37:45.000000000 +0000
-+++ ncurses-6.1-20191207/include/curses.tail	2019-12-07 16:10:32.000000000 +0000
-@@ -1,4 +1,4 @@
--/* $Id: curses.tail,v 1.23 2016/02/13 16:37:45 tom Exp $ */
-+/* $Id: curses.tail,v 1.24 2019/12/07 16:10:32 tom Exp $ */
- /*
-  * vile:cmode:
-  * This file is part of ncurses, designed to be appended after curses.h.in
-@@ -142,7 +142,8 @@
- #define _tracech_t		_tracechtype
- #define _tracech_t2		_tracechtype2
- #endif
--extern NCURSES_EXPORT(void) trace (const unsigned int);
-+extern NCURSES_EXPORT(void) trace (const unsigned) GCC_DEPRECATED("use curses_trace");
-+extern NCURSES_EXPORT(unsigned) curses_trace (const unsigned);
- 
- /* trace masks */
- #define TRACE_DISABLE	0x0000	/* turn off tracing */
-Index: include/term_entry.h
-Prereq:  1.57 
---- ncurses-6.1-20191130+/include/term_entry.h	2018-05-26 13:50:53.000000000 +0000
-+++ ncurses-6.1-20191207/include/term_entry.h	2019-12-07 16:11:15.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
-  *     and: Thomas E. Dickey                        1998-on                 *
-  ****************************************************************************/
- 
--/* $Id: term_entry.h,v 1.57 2018/05/26 13:50:53 tom Exp $ */
-+/* $Id: term_entry.h,v 1.58 2019/12/07 16:11:15 tom Exp $ */
- 
- /*
-  *	term_entry.h -- interface to entry-manipulation code
-@@ -208,7 +208,7 @@
- #endif /* NCURSES_INTERNALS */
- 
- /*
-- * These entrypoints are used by tack.
-+ * These entrypoints were used by tack before 1.08.
-  */
- 
- #undef  NCURSES_TACK_1_08
-Index: include/tic.h
-Prereq:  1.79 
---- ncurses-6.1-20191130+/include/tic.h	2019-07-20 20:19:54.000000000 +0000
-+++ ncurses-6.1-20191207/include/tic.h	2019-12-07 16:05:22.000000000 +0000
-@@ -33,7 +33,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: tic.h,v 1.79 2019/07/20 20:19:54 tom Exp $
-+ * $Id: tic.h,v 1.80 2019/12/07 16:05:22 tom Exp $
-  *	tic.h - Global variables and structures for the terminfo compiler.
-  */
- 
-@@ -361,7 +361,7 @@
- #endif /* NCURSES_INTERNALS */
- 
- /*
-- * These entrypoints are used by tack.
-+ * These entrypoints were used by tack before 1.08.
-  */
- 
- #undef  NCURSES_TACK_1_08
-Index: man/curs_trace.3x
-Prereq:  1.19 
---- ncurses-6.1-20191130+/man/curs_trace.3x	2017-11-18 23:47:37.000000000 +0000
-+++ ncurses-6.1-20191207/man/curs_trace.3x	2019-12-07 18:55:02.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2000-2016,2017 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2000-2017,2019 Free 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,11 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_trace.3x,v 1.19 2017/11/18 23:47:37 tom Exp $
-+.\" $Id: curs_trace.3x,v 1.20 2019/12/07 18:55:02 tom Exp $
-+.ie \n(.g .ds `` \(lq
-+.el       .ds `` ``
-+.ie \n(.g .ds '' \(rq
-+.el       .ds '' ''
- .de bP
- .ie n  .IP \(bu 4
- .el    .IP \(bu 2
-@@ -35,6 +39,7 @@
- .na
- .hy 0
- .SH NAME
-+\fBcurses_trace\fR,
- \fBtrace\fR,
- \fB_tracef\fR,
- \fB_traceattr\fR,
-@@ -52,7 +57,7 @@
- .SH SYNOPSIS
- \fB#include \fR
- .sp
--\fBvoid trace(const unsigned int \fP\fIparam\fP\fB);\fR
-+\fBunsigned curses_trace(const unsigned \fP\fIparam\fP\fB);\fR
- .sp
- \fBvoid _tracef(const char *\fP\fIformat\fP\fB, ...);\fR
- .sp
-@@ -75,34 +80,54 @@
- \fBchar *_nc_tracebits(void);\fR
- .br
- \fBchar *_tracemouse(const MEVENT *\fP\fIevent\fP\fB);\fR
-+.sp
-+/* deprecated */
-+.br
-+\fBvoid trace(const unsigned int \fP\fIparam\fP\fB);\fR
- .SH DESCRIPTION
--The \fBtrace\fR routines are used for debugging the ncurses libraries,
-+The \fIcurses trace\fR routines are used for debugging the ncurses libraries,
- as well as applications which use the ncurses libraries.
--These functions are normally available only with the debugging library
--e.g., \fIlibncurses_g.a\fR, but may be compiled into any model (shared, static,
-+Some limitations apply:
-+.bP
-+Aside from \fBcurses_trace\fP,
-+the other functions are normally available only with the debugging library
-+e.g., \fIlibncurses_g.a\fR.
-+.IP
-+All of the trace functions may be compiled into any model (shared, static,
- profile) by defining the symbol \fBTRACE\fR.
--Additionally, some functions are only available with the wide-character
--configuration of the libraries.
-+.bP
-+Additionally, the functions which use \fBcchar_t\fP
-+are only available with the wide-character configuration of the libraries.
- .SS Functions
- The principal parts of this interface are
- .bP
--\fBtrace\fR, which selectively enables different tracing features, and
-+\fBcurses_trace\fR, which selectively enables different tracing features, and
- .bP
- \fB_tracef\fR, which writes formatted data to the \fItrace\fR file.
--.PP
--Calling \fBtrace\fR with a nonzero parameter creates the file \fBtrace\fR
--in the current directory for output.
--If the file already exists, no tracing is done.
--.PP
-+.IP
- The other functions either return a pointer to a string-area
--(allocated by the corresponding function),
--or return no value (such as \fB_tracedump\fP, which implements the
--screen dump for \fBTRACE_UPDATE\fP).
--The caller should not free these
--strings, since the allocation is reused on successive calls.
-+(allocated by the corresponding function), or return no value
-+(such as \fB_tracedump\fP,
-+which implements the screen dump for \fBTRACE_UPDATE\fP).
-+The caller should not free these strings,
-+since the allocation is reused on successive calls.
- To work around the problem of a single string-area per function,
- some use a buffer-number parameter, telling the library to allocate
- additional string-areas.
-+.PP
-+The \fBcurses_trace\fR function is always available,
-+whether or not the other trace functions are available:
-+.bP
-+If tracing is available,
-+calling \fBcurses_trace\fR with a nonzero parameter
-+updates the trace mask,
-+and returns the previous trace mask.
-+.IP
-+When the trace mask is nonzero,
-+ncurses creates the file \*(``trace\*('' in the current directory for output.
-+If the file already exists, no tracing is done.
-+.bP
-+If tracing is not available, \fBcurses_trace\fP returns zero (0).
- .SS Trace Parameter
- The trace parameter is formed by OR'ing
- values from the list of \fBTRACE_\fP\fIxxx\fR definitions in \fB\fR.
-@@ -114,7 +139,7 @@
- The library flushes the output file,
- but retains an open file-descriptor to the trace file
- so that it can resume tracing later if a nonzero parameter is passed
--to the \fBtrace\fP function.
-+to the \fBcurses_trace\fP function.
- .TP 5
- .B TRACE_TIMES
- trace user and system times of updates.
-@@ -164,13 +189,13 @@
- .B TRACE_MAXIMUM
- maximum trace level, enables all of the separate trace features.
- .PP
--Some tracing features are enabled whenever the \fBtrace\fR parameter
-+Some tracing features are enabled whenever the \fBcurses_trace\fR parameter
- is nonzero.
- Some features overlap.
- The specific names are used as a guideline.
- .SS Initialization
- These functions check the \fBNCURSES_TRACE\fP environment variable,
--to set the tracing feature as if \fBtrace\fP was called:
-+to set the tracing feature as if \fBcurses_trace\fP was called:
- .RS 4
- .PP
- .na
-@@ -194,8 +219,8 @@
- .SS Command-line Utilities
- .PP
- The command-line utilities such as \fBtic\fP(1) provide a verbose option
--which extends the set of messages written using the \fBtrace\fP function.
--Both of these (\fB\-v\fP and \fBtrace\fP)
-+which extends the set of messages written using the \fBcurses_trace\fP function.
-+Both of these (\fB\-v\fP and \fBcurses_trace\fP)
- use the same variable (\fB_nc_tracing\fP),
- which determines the messages which are written.
- .PP
-@@ -216,15 +241,49 @@
- .SH PORTABILITY
- These functions are not part of the XSI interface.
- Some other curses implementations are known to
--have similar, undocumented features,
--but they are not compatible with ncurses.
-+have similar features,
-+but they are not compatible with ncurses:
-+.bP
-+SVr4 provided \fBtraceon\fP and \fBtraceoff\fP,
-+to control whether debugging information was written
-+to the \*(``trace\*('' file.
-+While the functions were always available,
-+this feature was only enabled
-+if \fBDEBUG\fP was defined when building the library.
-+.IP
-+The SVr4 tracing feature is undocumented.
-+.bP
-+PDCurses provides \fBtraceon\fP and \fBtraceoff\fP,
-+which (like SVr4) are always available,
-+and enable tracing
-+to the \*(``trace\*('' file
-+only when a debug-library is built.
-+.IP
-+PDCurses has a short description of these functions,
-+with a note that they are not present in X/Open Curses,
-+ncurses or NetBSD.
-+It does not mention SVr4,
-+but the functions' inclusion in a header file section
-+labeled \*(``Quasi-standard\*('' hints at the origin.
-+.bP
-+NetBSD does not provide functions for enabling/disabling traces.
-+It uses environment variables
-+\fBCURSES_TRACE_MASK\fP and
-+\fBCURSES_TRACE_FILE\fP to determine what is traced,
-+and where the results are written.
-+This is available only when a debug-library is built.
-+.IP
-+The NetBSD tracing feature is undocumented.
- .PP
--A few functions are not provided when symbol versioning is used:
-+A few ncurses functions are not provided when symbol versioning is used:
- .RS 4
- .PP
- _nc_tracebits,
- _tracedump,
- _tracemouse
- .RE
-+.PP
-+The original \fBtrace\fP routine was deprecated because
-+it often conflicted with application names.
- .SH SEE ALSO
- \fBcurses\fR(3X).
-Index: ncurses/base/lib_freeall.c
-Prereq:  1.69 
---- ncurses-6.1-20191130+/ncurses/base/lib_freeall.c	2018-03-01 15:02:12.000000000 +0000
-+++ ncurses-6.1-20191207/ncurses/base/lib_freeall.c	2019-12-07 20:28:03.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -39,7 +39,7 @@
- extern int malloc_errfd;	/* FIXME */
- #endif
- 
--MODULE_ID("$Id: lib_freeall.c,v 1.69 2018/03/01 15:02:12 tom Exp $")
-+MODULE_ID("$Id: lib_freeall.c,v 1.70 2019/12/07 20:28:03 tom Exp $")
- 
- /*
-  * Free all ncurses data.  This is used for testing only (there's no practical
-@@ -150,7 +150,7 @@
-     NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
-     NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_ARG);
- #ifdef TRACE
--    trace(0);			/* close trace file, freeing its setbuf */
-+    curses_trace(0);		/* close trace file, freeing its setbuf */
-     {
- 	static va_list fake;
- 	free(_nc_varargs("?", fake));
-Index: ncurses/curses.priv.h
-Prereq:  1.625 
---- ncurses-6.1-20191130+/ncurses/curses.priv.h	2019-07-28 18:32:05.000000000 +0000
-+++ ncurses-6.1-20191207/ncurses/curses.priv.h	2019-12-07 20:08:06.000000000 +0000
-@@ -34,7 +34,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: curses.priv.h,v 1.625 2019/07/28 18:32:05 tom Exp $
-+ * $Id: curses.priv.h,v 1.626 2019/12/07 20:08:06 tom Exp $
-  *
-  *	curses.priv.h
-  *
-@@ -1771,7 +1771,7 @@
- 	if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \
- 	    int t = _nc_getenv_num("NCURSES_TRACE"); \
- 	    if (t >= 0) \
--		trace((unsigned) t); \
-+		curses_trace((unsigned) t); \
- 	}
- #else
- #define START_TRACE() /* nothing */
-Index: ncurses/tinfo/entries.c
-Prereq:  1.27 
---- ncurses-6.1-20191130+/ncurses/tinfo/entries.c	2019-03-09 23:41:08.000000000 +0000
-+++ ncurses-6.1-20191207/ncurses/tinfo/entries.c	2019-12-07 20:28:55.000000000 +0000
-@@ -37,7 +37,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: entries.c,v 1.27 2019/03/09 23:41:08 tom Exp $")
-+MODULE_ID("$Id: entries.c,v 1.28 2019/12/07 20:28:55 tom Exp $")
- 
- /****************************************************************************
-  *
-@@ -148,7 +148,7 @@
- 
- #ifdef TRACE
-     T((T_RETURN("")));
--    trace(0);
-+    curses_trace(0);
-     _nc_trace_buf(-1, (size_t) 0);
- #endif
- 
-Index: ncurses/trace/lib_trace.c
-Prereq:  1.92 
---- ncurses-6.1-20191130+/ncurses/trace/lib_trace.c	2019-03-23 23:47:16.000000000 +0000
-+++ ncurses-6.1-20191207/ncurses/trace/lib_trace.c	2019-12-07 22:32:36.000000000 +0000
-@@ -47,7 +47,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: lib_trace.c,v 1.92 2019/03/23 23:47:16 tom Exp $")
-+MODULE_ID("$Id: lib_trace.c,v 1.94 2019/12/07 22:32:36 tom Exp $")
- 
- NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
- 
-@@ -91,10 +91,14 @@
- #define MyPath		_nc_globals.trace_fname
- #define MyLevel		_nc_globals.trace_level
- #define MyNested	_nc_globals.nested_tracef
-+#endif /* TRACE */
- 
--NCURSES_EXPORT(void)
--trace(const unsigned int tracelevel)
-+NCURSES_EXPORT(unsigned)
-+curses_trace(unsigned tracelevel)
- {
-+    unsigned result;
-+#if defined(TRACE)
-+    result = _nc_tracing;
-     if ((MyFP == 0) && tracelevel) {
- 	MyInit = TRUE;
- 	if (MyFD >= 0) {
-@@ -146,6 +150,18 @@
- 	_nc_tracing = tracelevel;
- 	_tracef("tracelevel=%#x", tracelevel);
-     }
-+#else
-+    (void) tracelevel;
-+    result = 0;
-+#endif
-+    return result;
-+}
-+
-+#if defined(TRACE)
-+NCURSES_EXPORT(void)
-+trace(const unsigned int tracelevel)
-+{
-+    curses_trace(tracelevel);
- }
- 
- static void
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20191130+/package/debian-mingw/changelog	2019-11-30 14:52:31.000000000 +0000
-+++ ncurses-6.1-20191207/package/debian-mingw/changelog	2019-12-07 10:19:49.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191130) unstable; urgency=low
-+ncurses6 (6.1+20191207) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 30 Nov 2019 09:52:31 -0500
-+ -- Thomas E. Dickey   Sat, 07 Dec 2019 05:19:49 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw/compat
---- ncurses-6.1-20191130+/package/debian-mingw/compat	2018-01-13 20:21:09.000000000 +0000
-+++ ncurses-6.1-20191207/package/debian-mingw/compat	2019-12-07 23:33:23.000000000 +0000
-@@ -1 +1 @@
--7
-+9
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20191130+/package/debian-mingw64/changelog	2019-11-30 14:52:31.000000000 +0000
-+++ ncurses-6.1-20191207/package/debian-mingw64/changelog	2019-12-07 10:19:49.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191130) unstable; urgency=low
-+ncurses6 (6.1+20191207) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 30 Nov 2019 09:52:31 -0500
-+ -- Thomas E. Dickey   Sat, 07 Dec 2019 05:19:49 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/compat
---- ncurses-6.1-20191130+/package/debian-mingw64/compat	2018-01-13 20:21:09.000000000 +0000
-+++ ncurses-6.1-20191207/package/debian-mingw64/compat	2019-12-07 23:33:23.000000000 +0000
-@@ -1 +1 @@
--7
-+9
-Index: package/debian/changelog
---- ncurses-6.1-20191130+/package/debian/changelog	2019-11-30 14:52:31.000000000 +0000
-+++ ncurses-6.1-20191207/package/debian/changelog	2019-12-07 10:19:49.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20191130) unstable; urgency=low
-+ncurses6 (6.1+20191207) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 30 Nov 2019 09:52:31 -0500
-+ -- Thomas E. Dickey   Sat, 07 Dec 2019 05:19:49 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/debian/compat
---- ncurses-6.1-20191130+/package/debian/compat	2018-01-13 20:21:09.000000000 +0000
-+++ ncurses-6.1-20191207/package/debian/compat	2019-12-07 23:33:23.000000000 +0000
-@@ -1 +1 @@
--7
-+9
-Index: package/mingw-ncurses.nsi
-Prereq:  1.363 
---- ncurses-6.1-20191130+/package/mingw-ncurses.nsi	2019-11-30 14:52:31.000000000 +0000
-+++ ncurses-6.1-20191207/package/mingw-ncurses.nsi	2019-12-07 10:19:49.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.363 2019/11/30 14:52:31 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.364 2019/12/07 10:19:49 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2019"
--!define VERSION_MMDD  "1130"
-+!define VERSION_MMDD  "1207"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20191130+/package/mingw-ncurses.spec	2019-11-30 14:52:31.000000000 +0000
-+++ ncurses-6.1-20191207/package/mingw-ncurses.spec	2019-12-07 10:19:49.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20191130
-+Release: 20191207
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.map
-Prereq:  1.47 
---- ncurses-6.1-20191130+/package/ncurses.map	2019-05-04 22:35:46.000000000 +0000
-+++ ncurses-6.1-20191207/package/ncurses.map	2019-12-07 18:03:20.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncurses.map,v 1.47 2019/05/04 22:35:46 tom Exp $
-+# $Id: ncurses.map,v 1.48 2019/12/07 18:03:20 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -1198,6 +1198,7 @@
- 		_nc_find_user_entry;
- 		_nc_fmt_funcptr;
- 		_nc_wacs_width;
-+		curses_trace;
- 	local:
- 		_*;
- } NCURSES_TINFO_6.1.20171230;
-Index: package/ncurses.spec
---- ncurses-6.1-20191130+/package/ncurses.spec	2019-11-30 14:52:31.000000000 +0000
-+++ ncurses-6.1-20191207/package/ncurses.spec	2019-12-07 10:19:49.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20191130
-+Release: 20191207
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.sym
-Prereq:  1.33 
---- ncurses-6.1-20191130+/package/ncurses.sym	2019-05-04 21:54:44.000000000 +0000
-+++ ncurses-6.1-20191207/package/ncurses.sym	2019-12-07 18:03:20.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncurses.sym,v 1.33 2019/05/04 21:54:44 tom Exp $
-+# $Id: ncurses.sym,v 1.34 2019/12/07 18:03:20 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -295,6 +295,7 @@
- curs_set
- curs_set_sp
- curscr
-+curses_trace
- curses_version
- data_ahead
- data_behind
-Index: package/ncursest.map
-Prereq:  1.45 
---- ncurses-6.1-20191130+/package/ncursest.map	2019-05-04 22:36:26.000000000 +0000
-+++ ncurses-6.1-20191207/package/ncursest.map	2019-12-07 18:03:20.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursest.map,v 1.45 2019/05/04 22:36:26 tom Exp $
-+# $Id: ncursest.map,v 1.46 2019/12/07 18:03:20 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -483,6 +483,7 @@
- 		_nc_find_user_entry;
- 		_nc_fmt_funcptr;
- 		_nc_wacs_width;
-+		curses_trace;
- 	local:
- 		_*;
- } NCURSES_TINFO_6.1.20171230;
-Index: package/ncursest.spec
---- ncurses-6.1-20191130+/package/ncursest.spec	2019-11-30 14:52:31.000000000 +0000
-+++ ncurses-6.1-20191207/package/ncursest.spec	2019-12-07 10:19:49.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20191130
-+Release: 20191207
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.sym
-Prereq:  1.37 
---- ncurses-6.1-20191130+/package/ncursest.sym	2019-05-04 22:29:26.000000000 +0000
-+++ ncurses-6.1-20191207/package/ncursest.sym	2019-12-07 18:03:20.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursest.sym,v 1.37 2019/05/04 22:29:26 tom Exp $
-+# $Id: ncursest.sym,v 1.38 2019/12/07 18:03:20 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -304,6 +304,7 @@
- current_item
- curs_set
- curs_set_sp
-+curses_trace
- curses_version
- data_ahead
- data_behind
-Index: package/ncursestw.map
-Prereq:  1.47 
---- ncurses-6.1-20191130+/package/ncursestw.map	2019-05-04 22:36:56.000000000 +0000
-+++ ncurses-6.1-20191207/package/ncursestw.map	2019-12-07 18:03:20.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursestw.map,v 1.47 2019/05/04 22:36:56 tom Exp $
-+# $Id: ncursestw.map,v 1.48 2019/12/07 18:03:20 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -489,6 +489,7 @@
- 		_nc_find_user_entry;
- 		_nc_fmt_funcptr;
- 		_nc_wacs_width;
-+		curses_trace;
- 	local:
- 		_*;
- } NCURSES_TINFO_6.1.20171230;
-Index: package/ncursestw.sym
-Prereq:  1.36 
---- ncurses-6.1-20191130+/package/ncursestw.sym	2019-05-04 22:29:12.000000000 +0000
-+++ ncurses-6.1-20191207/package/ncursestw.sym	2019-12-07 18:03:20.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursestw.sym,v 1.36 2019/05/04 22:29:12 tom Exp $
-+# $Id: ncursestw.sym,v 1.37 2019/12/07 18:03:20 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -320,6 +320,7 @@
- current_item
- curs_set
- curs_set_sp
-+curses_trace
- curses_version
- data_ahead
- data_behind
-Index: package/ncursesw.map
-Prereq:  1.50 
---- ncurses-6.1-20191130+/package/ncursesw.map	2019-05-04 22:37:14.000000000 +0000
-+++ ncurses-6.1-20191207/package/ncursesw.map	2019-12-07 18:03:20.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursesw.map,v 1.50 2019/05/04 22:37:14 tom Exp $
-+# $Id: ncursesw.map,v 1.51 2019/12/07 18:03:20 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -483,6 +483,7 @@
- 		_nc_find_user_entry;
- 		_nc_fmt_funcptr;
- 		_nc_wacs_width;
-+		curses_trace;
- 	local:
- 		_*;
- } NCURSES_TINFO_6.1.20171230;
-Index: package/ncursesw.sym
-Prereq:  1.35 
---- ncurses-6.1-20191130+/package/ncursesw.sym	2019-05-04 21:54:38.000000000 +0000
-+++ ncurses-6.1-20191207/package/ncursesw.sym	2019-12-07 18:03:20.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursesw.sym,v 1.35 2019/05/04 21:54:38 tom Exp $
-+# $Id: ncursesw.sym,v 1.36 2019/12/07 18:03:20 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -308,6 +308,7 @@
- curs_set
- curs_set_sp
- curscr
-+curses_trace
- curses_version
- data_ahead
- data_behind
-Index: test/demo_menus.c
-Prereq:  1.69 
---- ncurses-6.1-20191130+/test/demo_menus.c	2019-08-24 21:41:50.000000000 +0000
-+++ ncurses-6.1-20191207/test/demo_menus.c	2019-12-07 18:06:12.000000000 +0000
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: demo_menus.c,v 1.69 2019/08/24 21:41:50 tom Exp $
-+ * $Id: demo_menus.c,v 1.70 2019/12/07 18:06:12 tom Exp $
-  *
-  * Demonstrate a variety of functions from the menu library.
-  * Thomas Dickey - 2005/4/9
-@@ -139,7 +139,7 @@
- 	} else {
- 	    _nc_tracing = save_trace;
- 	}
--	trace(_nc_tracing);
-+	curses_trace(_nc_tracing);
- 	if (_nc_tracing)
- 	    Trace(("TOGGLE-TRACING ON"));
-     }
-@@ -631,7 +631,7 @@
- 		    newtrace |= td->mask;
- 		}
- 	    }
--	    trace(newtrace);
-+	    curses_trace(newtrace);
- 	    Trace(("trace level interactively set to %s", tracetrace(_nc_tracing)));
- 
- 	    MvWPrintw(status, 1, 0,
-@@ -1016,7 +1016,7 @@
- #endif /* HAVE_RIPOFFLINE */
- #ifdef TRACE
- 	case 't':
--	    trace((unsigned) strtoul(optarg, 0, 0));
-+	    curses_trace((unsigned) strtoul(optarg, 0, 0));
- 	    break;
- #endif
- 	default:
-Index: test/hashtest.c
-Prereq:  1.34 
---- ncurses-6.1-20191130+/test/hashtest.c	2017-09-30 15:42:53.000000000 +0000
-+++ ncurses-6.1-20191207/test/hashtest.c	2019-12-07 18:07:04.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2017 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2017,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -30,7 +30,7 @@
-  *
-  * Generate timing statistics for vertical-motion optimization.
-  *
-- * $Id: hashtest.c,v 1.34 2017/09/30 15:42:53 tom Exp $
-+ * $Id: hashtest.c,v 1.35 2019/12/07 18:07:04 tom Exp $
-  */
- 
- #include 
-@@ -222,7 +222,7 @@
- 	test_optimize = TRUE;
-     }
- #if USE_TRACE
--    trace(TRACE_TIMES);
-+    curses_trace(TRACE_TIMES);
- #endif
- 
-     InitAndCatch(initscr(), finish);
-Index: test/lrtest.c
-Prereq:  1.24 
---- ncurses-6.1-20191130+/test/lrtest.c	2017-09-04 11:28:19.000000000 +0000
-+++ ncurses-6.1-20191207/test/lrtest.c	2019-12-07 18:07:04.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2017,2019 Free 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 @@
-  * This can't be part of the ncurses test-program, because ncurses rips off the
-  * bottom line to do labels.
-  *
-- * $Id: lrtest.c,v 1.24 2017/09/04 11:28:19 tom Exp $
-+ * $Id: lrtest.c,v 1.25 2019/12/07 18:07:04 tom Exp $
-  */
- 
- #include 
-@@ -148,9 +148,9 @@
- 		nodelay(stdscr, TRUE);
- #ifdef TRACE
- 	    else if (ch == 'T')
--		trace(0);
-+		curses_trace(0);
- 	    else if (ch == 't')
--		trace(TRACE_CALLS | TRACE_ICALLS | TRACE_UPDATE);
-+		curses_trace(TRACE_CALLS | TRACE_ICALLS | TRACE_UPDATE);
- #endif
- #ifdef KEY_RESIZE
- 	    else if (ch == KEY_RESIZE) {
-Index: test/ncurses.c
-Prereq:  1.519 
---- ncurses-6.1-20191130+/test/ncurses.c	2019-09-22 19:12:40.000000000 +0000
-+++ ncurses-6.1-20191207/test/ncurses.c	2019-12-07 19:04:52.000000000 +0000
-@@ -40,7 +40,7 @@
-    Author: Eric S. Raymond  1993
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.519 2019/09/22 19:12:40 tom Exp $
-+$Id: ncurses.c,v 1.520 2019/12/07 19:04:52 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -210,7 +210,7 @@
- 	} else {
- 	    _nc_tracing = save_trace;
- 	}
--	trace(_nc_tracing);
-+	curses_trace(_nc_tracing);
- 	if (_nc_tracing)
- 	    Trace(("TOGGLE-TRACING ON"));
-     }
-@@ -344,7 +344,7 @@
- 	} else {
- 	    _nc_tracing = save_trace;
- 	}
--	trace(_nc_tracing);
-+	curses_trace(_nc_tracing);
- 	if (_nc_tracing)
- 	    Trace(("TOGGLE-TRACING ON"));
-     }
-@@ -3734,7 +3734,6 @@
-     MvAddCh(LINES / 2, 0,        colored_chtype(ACS_LTEE,  attr, pair));
-     MvAddCh(LINES / 2, COLS - 1, colored_chtype(ACS_RTEE,  attr, pair));
-     /* *INDENT-ON* */
--
- }
- 
- static int
-@@ -4282,7 +4281,6 @@
-     (void) mvadd_wch(LINES / 2,   0,        MERGE_ATTR(0, WACS_LTEE));
-     (void) mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(0, WACS_RTEE));
-     /* *INDENT-ON* */
--
- }
- 
- #undef MERGE_ATTR
-@@ -4355,7 +4353,6 @@
-     n = SHOW_UTF8(n, "WACS_S7",		"\342\216\274");
-     (void) SHOW_UTF8(n, "WACS_S9",	"\342\216\275");
-     /* *INDENT-ON* */
--
- }
- 
- /* display the wide-ACS character set */
-@@ -6345,7 +6342,7 @@
-     for (ip = menu_items(m); *ip; ip++)
- 	if (item_value(*ip))
- 	    newtrace |= t_tbl[item_index(*ip)].mask;
--    trace(newtrace);
-+    curses_trace(newtrace);
-     Trace(("trace level interactively set to %s", tracetrace(_nc_tracing)));
- 
-     MvPrintw(LINES - 2, 0,
-@@ -7992,10 +7989,10 @@
- #ifdef TRACE
-     /* enable debugging */
- #if !USE_LIBMENU
--    trace(save_trace);
-+    curses_trace(save_trace);
- #else
-     if (!isatty(fileno(stdin)))
--	trace(save_trace);
-+	curses_trace(save_trace);
- #endif /* USE_LIBMENU */
- #endif /* TRACE */
- 
-Index: test/package/debian-mingw/compat
---- ncurses-6.1-20191130+/test/package/debian-mingw/compat	2018-01-13 20:21:09.000000000 +0000
-+++ ncurses-6.1-20191207/test/package/debian-mingw/compat	2019-12-07 23:32:53.000000000 +0000
-@@ -1 +1 @@
--7
-+9
-Index: test/package/debian-mingw/control
---- ncurses-6.1-20191130+/test/package/debian-mingw/control	2018-01-01 11:55:21.000000000 +0000
-+++ ncurses-6.1-20191207/test/package/debian-mingw/control	2019-12-07 23:35:21.000000000 +0000
-@@ -9,7 +9,7 @@
- Package: mingw32-ncurses-examples
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: ncurses-examples - example/test programs from ncurses
-+Description: example/test programs from ncurses
-  These are the example/test programs from the ncurses distribution.
-  .
-  This package is used for testing ABI 6 with the MinGW 32-bit port.
-Index: test/package/debian-mingw64/compat
---- ncurses-6.1-20191130+/test/package/debian-mingw64/compat	2018-01-13 20:21:09.000000000 +0000
-+++ ncurses-6.1-20191207/test/package/debian-mingw64/compat	2019-12-07 23:32:53.000000000 +0000
-@@ -1 +1 @@
--7
-+9
-Index: test/package/debian-mingw64/control
---- ncurses-6.1-20191130+/test/package/debian-mingw64/control	2018-01-01 11:55:10.000000000 +0000
-+++ ncurses-6.1-20191207/test/package/debian-mingw64/control	2019-12-07 23:35:21.000000000 +0000
-@@ -9,7 +9,7 @@
- Package: mingw64-ncurses-examples
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: ncurses-examples - example/test programs from ncurses
-+Description: example/test programs from ncurses
-  These are the example/test programs from the ncurses distribution.
-  .
-  This package is used for testing ABI 6 with the MinGW 64-bit port.
-Index: test/package/debian/compat
---- ncurses-6.1-20191130+/test/package/debian/compat	2018-01-13 20:21:09.000000000 +0000
-+++ ncurses-6.1-20191207/test/package/debian/compat	2019-12-07 23:32:53.000000000 +0000
-@@ -1 +1 @@
--7
-+9
-Index: test/package/debian/control
---- ncurses-6.1-20191130+/test/package/debian/control	2018-01-01 11:53:23.000000000 +0000
-+++ ncurses-6.1-20191207/test/package/debian/control	2019-12-07 23:35:34.000000000 +0000
-@@ -9,7 +9,7 @@
- Package: ncurses-examples
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: ncurses-examples - example/test programs from ncurses
-+Description: example/test programs from ncurses
-  These are the example/test programs from the ncurses distribution.
-  .
-  This package installs in "bin/ncurses-examples" to avoid conflict with other
-@@ -18,7 +18,7 @@
- Package: ncursest-examples
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: ncurses-examples - example/test programs from ncurses
-+Description: example/test programs from ncurses
-  These are the example/test programs from the ncurses distribution, using
-  the thread configuration.
-  .
-Index: test/padview.c
-Prereq:  1.14 
---- ncurses-6.1-20191130+/test/padview.c	2019-07-13 20:41:47.000000000 +0000
-+++ ncurses-6.1-20191207/test/padview.c	2019-12-07 18:06:12.000000000 +0000
-@@ -28,7 +28,7 @@
- /*
-  * clone of view.c, using pads
-  *
-- * $Id: padview.c,v 1.14 2019/07/13 20:41:47 tom Exp $
-+ * $Id: padview.c,v 1.15 2019/12/07 18:06:12 tom Exp $
-  */
- 
- #include 
-@@ -324,11 +324,11 @@
- 		int tvalue = (int) strtol(optarg, &next, 0);
- 		if (tvalue < 0 || (next != 0 && *next != 0))
- 		    usage();
--		trace((unsigned) tvalue);
-+		curses_trace((unsigned) tvalue);
- 	    }
- 	    break;
- 	case 't':
--	    trace(TRACE_CALLS);
-+	    curses_trace(TRACE_CALLS);
- 	    break;
- #endif
- 	default:
-Index: test/test.priv.h
-Prereq:  1.182 
---- ncurses-6.1-20191130+/test/test.priv.h	2019-04-20 20:15:39.000000000 +0000
-+++ ncurses-6.1-20191207/test/test.priv.h	2019-12-07 19:03:20.000000000 +0000
-@@ -29,7 +29,7 @@
- /****************************************************************************
-  *  Author: Thomas E. Dickey                    1996-on                     *
-  ****************************************************************************/
--/* $Id: test.priv.h,v 1.182 2019/04/20 20:15:39 tom Exp $ */
-+/* $Id: test.priv.h,v 1.183 2019/12/07 19:03:20 tom Exp $ */
- 
- #ifndef __TEST_PRIV_H
- #define __TEST_PRIV_H 1
-@@ -976,9 +976,9 @@
- #endif
- 
- #if !HAVE_STRSTR
--extern char * _nc_strstr (const char *, const char *);
-+extern char *_nc_strstr(const char *, const char *);
- #define strstr(a,b) _nc_strstr((a),(b))
--#endif	/* !HAVE_STRSTR */
-+#endif /* !HAVE_STRSTR */
- 
- /* Use this to quiet gcc's -Wwrite-strings warnings, but accommodate SVr4
-  * curses which doesn't have const parameters declared (so far) in the places
-@@ -1129,7 +1129,7 @@
- 	if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \
- 	    int t = _nc_getenv_num("NCURSES_TRACE"); \
- 	    if (t >= 0) \
--		trace((unsigned) t); \
-+		curses_trace((unsigned) t); \
- 	}
- extern unsigned _nc_tracing;
- extern int _nc_getenv_num(const char *);
-Index: test/testcurs.c
-Prereq:  1.53 
---- ncurses-6.1-20191130+/test/testcurs.c	2017-12-23 21:38:26.000000000 +0000
-+++ ncurses-6.1-20191207/test/testcurs.c	2019-12-07 18:06:12.000000000 +0000
-@@ -6,7 +6,7 @@
-  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
-  *                  PDCurses or under Unix System V, R4
-  *
-- * $Id: testcurs.c,v 1.53 2017/12/23 21:38:26 tom Exp $
-+ * $Id: testcurs.c,v 1.54 2019/12/07 18:06:12 tom Exp $
-  */
- 
- #include 
-@@ -59,7 +59,7 @@
-     PDC_debug("initTest called\n");
- #endif
- #ifdef TRACE
--    trace(TRACE_MAXIMUM);
-+    curses_trace(TRACE_MAXIMUM);
- #endif
-     initscr();
- #ifdef PDCDEBUG
-Index: test/testscanw.c
-Prereq:  1.11 
---- ncurses-6.1-20191130+/test/testscanw.c	2006-04-01 19:08:03.000000000 +0000
-+++ ncurses-6.1-20191207/test/testscanw.c	2019-12-07 18:07:04.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2019 Free 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 @@
-  * Date:  1997/03/17
-  * From:  bayern@morpheus.cis.yale.edu
-  *
-- * $Id: testscanw.c,v 1.11 2006/04/01 19:08:03 tom Exp $
-+ * $Id: testscanw.c,v 1.12 2019/12/07 18:07:04 tom Exp $
-  */
- #include 
- 
-@@ -47,7 +47,7 @@
-     echo();
- 
- #if 0
--    trace(TRACE_UPDATE | TRACE_CALLS);
-+    curses_trace(TRACE_UPDATE | TRACE_CALLS);
- #endif
-     while (argc > 1) {
- 	if (isdigit(UChar(*argv[1])))
-Index: test/view.c
-Prereq:  1.136 
---- ncurses-6.1-20191130+/test/view.c	2019-01-27 00:52:06.000000000 +0000
-+++ ncurses-6.1-20191207/test/view.c	2019-12-07 19:03:07.000000000 +0000
-@@ -51,7 +51,7 @@
-  * scroll operation worked, and the refresh() code only had to do a
-  * partial repaint.
-  *
-- * $Id: view.c,v 1.136 2019/01/27 00:52:06 tom Exp $
-+ * $Id: view.c,v 1.137 2019/12/07 19:03:07 tom Exp $
-  */
- 
- #include 
-@@ -88,7 +88,7 @@
- }
- 
- static int
--ch_len(NCURSES_CH_T * src)
-+ch_len(NCURSES_CH_T *src)
- {
-     int result = 0;
- #if USE_WIDEC_SUPPORT
-@@ -299,11 +299,13 @@
-     }
-     width = (width + 1) * 5;
-     my_win = newwin(2, width, 0, 0);
--    if (my_win == 0)
-+    if (my_win == 0) {
- 	failed("cannot allocate temporary window");
-+    }
- 
--    if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == 0)
-+    if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == 0) {
- 	failed("cannot allocate line-vector #2");
-+    }
- 
-     /*
-      * Use the curses library for rendering, including tab-conversion.  This
-@@ -348,8 +350,9 @@
- 	    x = width - 1;
- 	wmove(my_win, 0, 0);
- 	/* "x + 1" works with standard curses; some implementations are buggy */
--	if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == 0)
-+	if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == 0) {
- 	    failed("cannot allocate line-vector #3");
-+	}
- #if USE_WIDEC_SUPPORT
- 	win_wchnstr(my_win, vec_lines[k], x);
- #else
-@@ -450,11 +453,11 @@
- 		int tvalue = (int) strtol(optarg, &next, 0);
- 		if (tvalue < 0 || (next != 0 && *next != 0))
- 		    usage();
--		trace((unsigned) tvalue);
-+		curses_trace((unsigned) tvalue);
- 	    }
- 	    break;
- 	case 't':
--	    trace(TRACE_CALLS);
-+	    curses_trace(TRACE_CALLS);
- 	    break;
- #endif
- 	default:
-Index: test/worm.c
-Prereq:  1.79 
---- ncurses-6.1-20191130+/test/worm.c	2018-07-21 21:40:00.000000000 +0000
-+++ ncurses-6.1-20191207/test/worm.c	2019-12-07 19:04:09.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -52,7 +52,7 @@
-   traces will be dumped.  The program stops and waits for one character of
-   input at the beginning and end of the interval.
- 
--  $Id: worm.c,v 1.79 2018/07/21 21:40:00 tom Exp $
-+  $Id: worm.c,v 1.80 2019/12/07 19:04:09 tom Exp $
- */
- 
- #include 
-@@ -608,10 +608,10 @@
- #ifdef TRACE
- 	    if (trace_start || trace_end) {
- 		if (generation == trace_start) {
--		    trace(TRACE_CALLS);
-+		    curses_trace(TRACE_CALLS);
- 		    get_input();
- 		} else if (generation == trace_end) {
--		    trace(0);
-+		    curses_trace(0);
- 		    get_input();
- 		}
- 
diff --git a/ncurses-6.1-20191214.patch b/ncurses-6.1-20191214.patch
deleted file mode 100644
index c714434..0000000
--- a/ncurses-6.1-20191214.patch
+++ /dev/null
@@ -1,1901 +0,0 @@
-# ncurses 6.1 - patch 20191214 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.1 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.1 can be found at
-# 	ftp://ftp.invisible-island.net/ncurses/6.1
-#	http://invisible-mirror.net/archives/ncurses/6.1 
-#
-# ------------------------------------------------------------------------------
-# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191214.patch.gz
-# patch by Thomas E. Dickey 
-# created  Sun Dec 15 02:10:35 UTC 2019
-# ------------------------------------------------------------------------------
-# NEWS                                  |    6 ++++-
-# VERSION                               |    2 -
-# c++/cursesmain.cc                     |    6 ++---
-# dist.mk                               |    4 +--
-# doc/html/ada/funcs/T.htm              |    2 -
-# doc/html/man/adacurses6-config.1.html |    2 -
-# doc/html/man/captoinfo.1m.html        |    2 -
-# doc/html/man/clear.1.html             |    2 -
-# doc/html/man/curs_memleaks.3x.html    |   35 +++++++++++++++++++++-----------
-# doc/html/man/form.3x.html             |    2 -
-# doc/html/man/infocmp.1m.html          |    2 -
-# doc/html/man/infotocap.1m.html        |    2 -
-# doc/html/man/menu.3x.html             |    2 -
-# doc/html/man/ncurses.3x.html          |    2 -
-# doc/html/man/ncurses6-config.1.html   |    2 -
-# doc/html/man/panel.3x.html            |    2 -
-# doc/html/man/tabs.1.html              |    2 -
-# doc/html/man/terminfo.5.html          |    2 -
-# doc/html/man/tic.1m.html              |    2 -
-# doc/html/man/toe.1m.html              |    2 -
-# doc/html/man/tput.1.html              |    2 -
-# doc/html/man/tset.1.html              |    2 -
-# include/MKterm.h.awk.in               |   13 +++++++++--
-# include/curses.tail                   |    4 ++-
-# include/nc_alloc.h                    |   16 ++++++++++----
-# man/curs_memleaks.3x                  |   29 +++++++++++++++++++-------
-# ncurses/base/lib_freeall.c            |   19 ++++++++++++++---
-# ncurses/curses.priv.h                 |    9 +-------
-# ncurses/llib-lncurses                 |   15 +++++++++++++
-# ncurses/llib-lncursest                |   16 ++++++++++++++
-# ncurses/llib-lncursestw               |   16 ++++++++++++++
-# ncurses/llib-lncursesw                |   16 ++++++++++++++
-# ncurses/tinfo/comp_parse.c            |    4 +--
-# ncurses/tinfo/entries.c               |   11 +++++++++-
-# ncurses/tty/hashmap.c                 |   16 +++++---------
-# package/debian-mingw/changelog        |    4 +--
-# package/debian-mingw64/changelog      |    4 +--
-# package/debian/changelog              |    4 +--
-# package/mingw-ncurses.nsi             |    4 +--
-# package/mingw-ncurses.spec            |    2 -
-# package/ncurses.map                   |   11 ++++++++--
-# package/ncurses.spec                  |    2 -
-# package/ncurses.sym                   |    4 ++-
-# package/ncursest.map                  |   12 +++++++++-
-# package/ncursest.spec                 |    2 -
-# package/ncursest.sym                  |    4 ++-
-# package/ncursestw.map                 |   11 ++++++++--
-# package/ncursestw.sym                 |    4 ++-
-# package/ncursesw.map                  |   11 ++++++++--
-# package/ncursesw.sym                  |    4 ++-
-# progs/progs.priv.h                    |    7 +++---
-# test/demo_new_pair.c                  |    6 ++---
-# test/echochar.c                       |    4 +--
-# test/firework.c                       |    6 ++---
-# test/gdc.c                            |    8 +++----
-# test/hanoi.c                          |    6 ++---
-# test/lrtest.c                         |    4 +--
-# test/ncurses.c                        |    8 +++----
-# test/newdemo.c                        |    8 +++----
-# test/picsmap.c                        |   14 ++++++------
-# test/rain.c                           |    8 +++----
-# test/savescreen.c                     |    8 +++----
-# test/tclock.c                         |    4 +--
-# test/test.priv.h                      |    8 +++----
-# test/testcurs.c                       |    8 +++----
-# test/worm.c                           |    6 ++---
-# test/xmas.c                           |    6 ++---
-# 67 files changed, 315 insertions(+), 158 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.3415 
---- ncurses-6.1-20191207+/NEWS	2019-12-07 23:36:25.000000000 +0000
-+++ ncurses-6.1-20191214/NEWS	2019-12-14 21:26:03.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.3415 2019/12/07 23:36:25 tom Exp $
-+-- $Id: NEWS,v 1.3416 2019/12/14 21:26:03 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,10 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20191214
-+	+ add exit_curses() and exit_terminfo() to replace internal symbols for
-+	  leak-checking.
-+
- 20191207
- 	+ fix a few warnings for test-package builds
- 	+ add curses_trace(), to replace trace().
-Index: VERSION
---- ncurses-6.1-20191207+/VERSION	2019-12-07 10:19:49.000000000 +0000
-+++ ncurses-6.1-20191214/VERSION	2019-12-14 17:50:13.000000000 +0000
-@@ -1 +1 @@
--5:0:10	6.1	20191207
-+5:0:10	6.1	20191214
-Index: c++/cursesmain.cc
-Prereq:  1.15 
---- ncurses-6.1-20191207+/c++/cursesmain.cc	2013-09-28 20:56:47.000000000 +0000
-+++ ncurses-6.1-20191214/c++/cursesmain.cc	2019-12-14 22:48:23.000000000 +0000
-@@ -1,6 +1,6 @@
- // * this is for making emacs happy: -*-Mode: C++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2007,2013 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2013,2019 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -43,7 +43,7 @@
- #define CPP_HAS_TRY_CATCH 0
- #endif
- 
--MODULE_ID("$Id: cursesmain.cc,v 1.15 2013/09/28 20:56:47 tom Exp $")
-+MODULE_ID("$Id: cursesmain.cc,v 1.16 2019/12/14 22:48:23 tom Exp $")
- 
- #if HAVE_LOCALE_H
- #include 
-@@ -87,7 +87,7 @@
- #endif
- #if NO_LEAKS
-     delete A;
--    _nc_free_and_exit(res);
-+    exit_curses(res);
- #else
-     return(res);
- #endif
-Index: dist.mk
-Prereq:  1.1318 
---- ncurses-6.1-20191207+/dist.mk	2019-12-07 10:19:49.000000000 +0000
-+++ ncurses-6.1-20191214/dist.mk	2019-12-14 17:50:13.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1318 2019/12/07 10:19:49 tom Exp $
-+# $Id: dist.mk,v 1.1319 2019/12/14 17:50:13 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 = 6
- NCURSES_MINOR = 1
--NCURSES_PATCH = 20191207
-+NCURSES_PATCH = 20191214
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/ada/funcs/T.htm
---- ncurses-6.1-20191207+/doc/html/ada/funcs/T.htm	2019-07-26 23:48:31.000000000 +0000
-+++ ncurses-6.1-20191214/doc/html/ada/funcs/T.htm	2019-12-15 00:54:38.000000000 +0000
-@@ -20,8 +20,8 @@
- 
  • tgetnum
- 
  • tgetstr -  terminal_interface-curses-termcap.adb:108
- 
  • tgetstr -  terminal_interface-curses-termcap.adb:129
--
  • TGoto
- 
  • tgoto
-+
  • TGoto
- 
  • tigetflag
- 
  • tigetstr -  terminal_interface-curses-terminfo.adb:87
- 
  • tigetstr -  terminal_interface-curses-terminfo.adb:108
-Index: doc/html/man/adacurses6-config.1.html
---- ncurses-6.1-20191207+/doc/html/man/adacurses6-config.1.html	2019-12-07 20:48:39.000000000 +0000
-+++ ncurses-6.1-20191214/doc/html/man/adacurses6-config.1.html	2019-12-15 00:54:32.000000000 +0000
-@@ -125,7 +125,7 @@
-

    • SEE ALSO

    -        curses(3x)
- 
--       This describes ncurses version 6.1 (patch 20191207).
-+       This describes ncurses version 6.1 (patch 20191214).
- 
- 
- 
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.1-20191207+/doc/html/man/captoinfo.1m.html	2019-12-07 20:48:39.000000000 +0000
-+++ ncurses-6.1-20191214/doc/html/man/captoinfo.1m.html	2019-12-15 00:54:32.000000000 +0000
-@@ -198,7 +198,7 @@
-

    SEE ALSO

    -        infocmp(1m), curses(3x), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191207).
-+       This describes ncurses version 6.1 (patch 20191214).
- 
- 
-

    AUTHOR

    -Index: doc/html/man/clear.1.html
---- ncurses-6.1-20191207+/doc/html/man/clear.1.html	2019-12-07 20:48:39.000000000 +0000
-+++ ncurses-6.1-20191214/doc/html/man/clear.1.html	2019-12-15 00:54:32.000000000 +0000
-@@ -148,7 +148,7 @@
-

    SEE ALSO

    -        tput(1), terminfo(5)
- 
--       This describes ncurses version 6.1 (patch 20191207).
-+       This describes ncurses version 6.1 (patch 20191214).
- 
- 
- 
-Index: doc/html/man/curs_memleaks.3x.html
---- ncurses-6.1-20191207+/doc/html/man/curs_memleaks.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20191214/doc/html/man/curs_memleaks.3x.html	2019-12-15 00:54:33.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-Index: doc/html/man/curs_slk.3x.html
---- ncurses-6.1-20200111+/doc/html/man/curs_slk.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20200118/doc/html/man/curs_slk.3x.html	2020-01-19 02:05:10.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -203,6 +203,31 @@
-                or if memory for the labels cannot be allocated.
- 
- 
-+

    HISTORY

    -+       SVr3 introduced these functions:
-+         slk_clear
-+         slk_init
-+         slk_label
-+         slk_noutrefresh
-+         slk_refresh
-+         slk_restore
-+         slk_set
-+         slk_touch
-+
-+       SVr4 added these functions:
-+         slk_attroff
-+         slk_attron
-+         slk_attrset
-+         slk_start
-+
-+       X/Open Curses added these:
-+         slk_attr_off
-+         slk_attr_on
-+         slk_attr_set
-+         slk_color
-+         slk_wset
-+
-+
-

    EXTENSIONS

    -        X/Open  Curses  documents the opts argument as reserved for future use,
-        saying that it must be null.  This implementation uses  that  parameter
-@@ -270,6 +295,7 @@
- 
- 
- 
  • RETURN VALUE
    • 
-+
  • HISTORY
    • 
- 
  • EXTENSIONS
    • 
- 
  • NOTES
    • 
- 
  • PORTABILITY
    • 
-Index: doc/html/man/curs_terminfo.3x.html
---- ncurses-6.1-20200111+/doc/html/man/curs_terminfo.3x.html	2019-03-16 19:34:44.000000000 +0000
-+++ ncurses-6.1-20200118/doc/html/man/curs_terminfo.3x.html	2020-01-19 02:05:10.000000000 +0000
-@@ -1,6 +1,6 @@
- 
- 
- 
-@@ -237,6 +237,72 @@
-           XM string, override ncurses's built-in string which enables/disables
-              xterm mouse mode.
- 
-+             ncurses  sends a character sequence to the terminal to initialize
-+             mouse mode, and when the user clicks the  mouse  buttons  or  (in
-+             certain  modes) moves the mouse, handles the characters sent back
-+             by the terminal to tell it what was done with the mouse.
-+
-+             The mouse protocol is enabled when the mask passed in the  mouse-
-+             mask  function  is  nonzero.   By  default,  ncurses  handles the
-+             responses for the X11 xterm mouse protocol.  It also knows  about
-+             the  SGR  1006  xterm mouse protocol, but must to be told to look
-+             for this specifically.  It will not be able to guess  which  mode
-+             is  used, because the responses are enough alike that only confu-
-+             sion would result.
-+
-+             The XM capability has a single parameter.  If nonzero, the  mouse
-+             protocol  should  be enabled.  If zero, the mouse protocol should
-+             be disabled.  ncurses inspects this capability if it is  present,
-+             to  see whether the 1006 protocol is used.  If so, it expects the
-+             responses to use the SGR 1006 xterm mouse protocol.
-+
-+             The xterm mouse protocol is used  by  other  terminal  emulators.
-+             The  terminal database uses building-blocks for the various xterm
-+             mouse protocols which can be used in customized terminal descrip-
-+             tions.
-+
-+             The terminal database building blocks for this mouse feature also
-+             have  an  experimental  capability  xm.   The   "xm"   capability
-+             describes  the mouse response.  Currently there is no interpreter
-+             which would use this information to make the mouse  support  com-
-+             pletely data-driven.
-+
-+             xm shows the format of the mouse responses.  In this experimental
-+             capability, the parameters are
-+
-+               p1   y-ordinate
-+
-+               p2   x-ordinate
-+
-+               p3   button
-+
-+               p4   state, e.g., pressed or released
-+
-+               p5   y-ordinate starting region
-+
-+               p6   x-ordinate starting region
-+
-+               p7   y-ordinate ending region
-+
-+               p8   x-ordinate ending region
-+
-+             Here are examples from the terminal database for  the  most  com-
-+             monly used xterm mouse protocols:
-+
-+               xterm+x11mouse|X11 xterm mouse protocol,
-+                       kmous=\E[M, XM=\E[?1000%?%p1%{1}%=%th%el%;,
-+                       xm=\E[M
-+                          %?%p4%t%p3%e%{3}%;%' '%+%c
-+                          %p2%'!'%+%c
-+                          %p1%'!'%+%c,
-+
-+               xterm+sm+1006|xterm SGR-mouse,
-+                       kmous=\E[<, XM=\E[?1006;1000%?%p1%{1}%=%th%el%;,
-+                       xm=\E[<%i%p3%d;
-+                          %p1%d;
-+                          %p2%d;
-+                          %?%p4%tM%em%;,
-+
- 
-

    Extended key-definitions

    -        Several terminals provide the ability to send distinct strings for com-
-Index: form/frm_post.c
-Prereq:  1.11 
---- ncurses-6.1-20200111+/form/frm_post.c	2012-06-10 00:27:49.000000000 +0000
-+++ ncurses-6.1-20200118/form/frm_post.c	2020-01-18 17:05:03.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2012,2020 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,12 +32,12 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: frm_post.c,v 1.11 2012/06/10 00:27:49 tom Exp $")
-+MODULE_ID("$Id: frm_post.c,v 1.12 2020/01/18 17:05:03 tom Exp $")
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnform  
-+|   Facility      :  libnform
- |   Function      :  int post_form(FORM * form)
--|   
-+|
- |   Description   :  Writes the form into its associated subwindow.
- |
- |   Return Values :  E_OK              - success
-@@ -69,7 +69,7 @@
-   if ((form->cols > getmaxx(formwin)) || (form->rows > getmaxy(formwin)))
-     RETURN(E_NO_ROOM);
- 
--  /* reset form->curpage to an invald value. This forces Set_Form_Page
-+  /* reset form->curpage to an invalid value. This forces Set_Form_Page
-      to do the page initialization which is required by post_form.
-    */
-   page = form->curpage;
-@@ -87,9 +87,9 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnform  
-+|   Facility      :  libnform
- |   Function      :  int unpost_form(FORM * form)
--|   
-+|
- |   Description   :  Erase form from its associated subwindow.
- |
- |   Return Values :  E_OK            - success
-Index: form/fty_generic.c
-Prereq:  1.8 
---- ncurses-6.1-20200111+/form/fty_generic.c	2018-12-16 00:14:02.000000000 +0000
-+++ ncurses-6.1-20200118/form/fty_generic.c	2020-01-18 17:08:04.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2008-2016,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2008-2018,2020 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fty_generic.c,v 1.8 2018/12/16 00:14:02 tom Exp $")
-+MODULE_ID("$Id: fty_generic.c,v 1.9 2020/01/18 17:08:04 tom Exp $")
- 
- /*
-  * This is not a full implementation of a field type, but adds some
-@@ -55,15 +55,15 @@
-  * fieldtype they register with the forms library using this call.
-  *
-  * For that purpose we have extended the fieldtype struc by a new element
-- * that gets the arguments from a single struct passed by the caller. 
-- * 
-+ * that gets the arguments from a single struct passed by the caller.
-+ *
-  */
- #if NCURSES_INTEROP_FUNCS
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnform  
-+|   Facility      :  libnform
- |   Function      :  static void *Generic_This_Type( void * arg )
--|   
-+|
- |   Description   :  We interpret the passed arg just as a handle the
- |                    calling language uses to keep track of its allocated
- |                    argument structures. We can simply copy it back.
-@@ -89,7 +89,7 @@
- |                    write a field_check and a char_check function and give
- |                    them as input to this call. A callback to allow the
- |                    release of the allocated memory must also be provided.
--|                    For generic field types, we provide some more 
-+|                    For generic field types, we provide some more
- |                    information about the field as parameters.
- |
- |                    If an error occurs, errno is set to
-@@ -145,16 +145,16 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnform  
-+|   Facility      :  libnform
- |   Function      :  static TypeArgument *GenericArgument(
- |                      const FIELDTYPE* typ,
- |                      int (*argiterator)(void**),
- |                      int* err)
--|   
-+|
- |   Description   :  The iterator callback must browse through all fieldtype
- |                    parameters that have an argument associated with the
- |                    type. The iterator returns 1 if the operation to get
--|                    the next element was successfull, 0 otherwise. If the
-+|                    the next element was successful, 0 otherwise. If the
- |                    iterator could move to the next argument, it fills
- |                    the void* pointer representing the argument into the
- |                    location provided as argument to the iterator.
-@@ -206,14 +206,14 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnform  
-+|   Facility      :  libnform
- |   Function      :  int _nc_set_generic_fieldtype(
- |                      FIELD* field,
- |                      FIELDTYPE* ftyp,
- |                      int (*argiterator)(void**))
--|   
-+|
- |   Description   :  Assign the fieldtype to the field and use the iterator
--|                    mechanism to get the arguments when a check is 
-+|                    mechanism to get the arguments when a check is
- |                    performed.
- |
- |   Return Values :  E_OK if all went well
-@@ -264,11 +264,11 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnform  
-+|   Facility      :  libnform
- |   Function      :  WINDOW* _nc_form_cursor(
- |                      FORM* form,
- |                      int *pRow, int *pCol)
--|   
-+|
- |   Description   :  Get the current position of the form cursor position
- |                    We also return the field window
- |
-Index: man/curs_slk.3x
-Prereq:  1.34 
---- ncurses-6.1-20200111+/man/curs_slk.3x	2018-07-28 22:20:54.000000000 +0000
-+++ ncurses-6.1-20200118/man/curs_slk.3x	2020-01-18 22:49:38.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2018,2020 Free 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_slk.3x,v 1.34 2018/07/28 22:20:54 tom Exp $
-+.\" $Id: curs_slk.3x,v 1.35 2020/01/18 22:49:38 tom Exp $
- .TH curs_slk 3X ""
- .de bP
- .ie n  .IP \(bu 4
-@@ -242,6 +242,29 @@
- if the format parameter is outside the range 0..2, or if
- memory for the labels cannot be allocated.
- .RE
-+.SH HISTORY
-+SVr3 introduced these functions:
-+  slk_clear
-+  slk_init
-+  slk_label
-+  slk_noutrefresh
-+  slk_refresh
-+  slk_restore
-+  slk_set
-+  slk_touch
-+.PP
-+SVr4 added these functions:
-+  slk_attroff
-+  slk_attron
-+  slk_attrset
-+  slk_start
-+.PP
-+X/Open Curses added these:
-+  slk_attr_off
-+  slk_attr_on
-+  slk_attr_set
-+  slk_color
-+  slk_wset
- .SH EXTENSIONS
- .PP
- X/Open Curses documents the \fIopts\fP argument as reserved for future use,
-Index: man/curs_terminfo.3x
-Prereq:  1.60 
---- ncurses-6.1-20200111+/man/curs_terminfo.3x	2018-07-28 22:08:59.000000000 +0000
-+++ ncurses-6.1-20200118/man/curs_terminfo.3x	2020-01-18 23:55:46.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1999-2017,2018 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1999-2018,2020 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_terminfo.3x,v 1.60 2018/07/28 22:08:59 tom Exp $
-+.\" $Id: curs_terminfo.3x,v 1.63 2020/01/18 23:55:46 tom Exp $
- .TH curs_terminfo 3X ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -432,6 +432,104 @@
- X/Open states that \fBtputs\fP ignores the return value
- of the output function \fIputc\fP.
- .RE
-+.SH HISTORY
-+.PP
-+SVr2 introduced the terminfo feature.
-+Its programming manual mentioned these low-level functions:
-+.TS
-+l l
-+_ _
-+l l.
-+\fBFunction\fR	\fBDescription\fR
-+fixterm	restore tty to \*(``in curses\*('' state
-+gettmode	establish current tty modes
-+mvcur	low level cursor motion
-+putp	T{
-+utility function that uses \fBtputs\fP to send characters via \fBputchar\fP.
-+T}
-+resetterm	set tty modes to \*(``out of curses\*('' state
-+resetty	reset tty flags to stored value
-+saveterm	save current modes as \*(``in curses\*('' state
-+savetty	store current tty flags
-+setterm	establish terminal with given type
-+setupterm	establish terminal with given type
-+tparm	instantiate a string expression with parameters
-+tputs	apply padding information to a string
-+vidattr	like \fBvidputs\fP, but outputs through \fBputchar\fP
-+vidputs	T{
-+output a string to put terminal in a specified video attribute mode
-+T}
-+.TE
-+.PP
-+The programming manual also mentioned
-+functions provided for termcap compatibility
-+(commenting that they \*(``may go away at a later date\*(''):
-+.TS
-+l l
-+_ _
-+l l.
-+\fBFunction\fR	\fBDescription\fR
-+tgetent	look up termcap entry for given \fIname\fP
-+tgetflag	get boolean entry for given \fIid\fP
-+tgetnum	get numeric entry for given \fIid\fP
-+tgetstr	get string entry for given \fIid\fP
-+tgoto	apply parameters to given capability
-+tputs	T{
-+apply padding to capability, calling a function to put characters
-+T}
-+.TE
-+.PP
-+Early terminfo programs obtained capability values from the
-+\fBTERMINAL\fP structure initialized by \fBsetupterm\fR.
-+.PP
-+SVr3 extended terminfo by adding functions to retrieve capability values
-+(like the termcap interface),
-+and reusing tgoto and tputs:
-+.TS
-+l l
-+_ _
-+l l.
-+\fBFunction\fR	\fBDescription\fR
-+tigetflag	get boolean entry for given \fIid\fP
-+tigetnum	get numeric entry for given \fIid\fP
-+tigetstr	get string entry for given \fIid\fP
-+.TE
-+.PP
-+SVr3 also replaced several of the SVr2 terminfo functions
-+which had no counterpart in the termcap interface,
-+documenting them as obsolete:
-+.TS
-+l l
-+_ _
-+l l.
-+\fBFunction\fR	\fBReplaced by\fP
-+crmode	cbreak	
-+fixterm	reset_prog_mode	
-+gettmode	N/A	
-+nocrmode	nocbreak	
-+resetterm	reset_shell_mode	
-+saveterm	def_prog_mode	
-+setterm	setupterm	
-+.TE
-+.PP
-+SVr3 kept the \fBmvcur\fP, \fBvidattr\fP and \fBvidputs\fP functions,
-+along with \fBputp\fP, \fBtparm\fP and \fBtputs\fP.
-+The latter were needed to support padding,
-+and handling functions such as \fBvidattr\fP
-+(which used more than the two parameters supported by \fBtgoto\fP).
-+.PP
-+SVr3 introduced the functions for switching between terminal
-+descriptions, e.g., \fBset_curterm\fP.
-+The various global variables such as \fBboolnames\fP were mentioned
-+in the programming manual at this point.
-+.PP
-+SVr4 added the \fBvid_attr\fP and \fBvid_puts\fP functions.
-+.PP
-+There are other low-level functions declared in the curses header files
-+on Unix systems,
-+but none were documented.
-+The functions marked \*(``obsolete\*('' remained in use
-+by the Unix \fBvi\fP editor.
- .SH PORTABILITY
- .SS Legacy functions
- .PP
-Index: man/user_caps.5
-Prereq:  1.10 
---- ncurses-6.1-20200111+/man/user_caps.5	2019-05-18 22:48:40.000000000 +0000
-+++ ncurses-6.1-20200118/man/user_caps.5	2020-01-19 02:01:39.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2017-2018,2019 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2017-2019,2020 Free 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: user_caps.5,v 1.10 2019/05/18 22:48:40 tom Exp $
-+.\" $Id: user_caps.5,v 1.11 2020/01/19 02:01:39 tom Exp $
- .TH user_caps 5
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -258,6 +258,84 @@
- \fIstring\fP,
- override ncurses's built-in string which
- enables/disables \fBxterm\fP mouse mode.
-+.IP
-+ncurses sends a character sequence to the terminal to initialize mouse mode,
-+and when the user clicks the mouse buttons or (in certain modes) moves the
-+mouse, handles the characters sent back by the terminal to tell it what
-+was done with the mouse.
-+.IP
-+The mouse protocol is enabled when
-+the \fImask\fP passed in the \fBmousemask\fP function is nonzero.
-+By default, ncurses handles the responses for the X11 xterm mouse protocol.
-+It also knows about the \fISGR 1006\fP xterm mouse protocol,
-+but must to be told to look for this specifically.
-+It will not be able to guess which mode is used,
-+because the responses are enough alike that only confusion would result.
-+.IP
-+The \fBXM\fP capability has a single parameter.
-+If nonzero, the mouse protocol should be enabled.
-+If zero, the mouse protocol should be disabled.
-+ncurses inspects this capability if it is present,
-+to see whether the 1006 protocol is used.
-+If so, it expects the responses to use the \fISGR 1006\fP xterm mouse protocol.
-+.IP
-+The xterm mouse protocol is used by other terminal emulators.
-+The terminal database uses building-blocks for the various xterm mouse
-+protocols which can be used in customized terminal descriptions.
-+.IP
-+The terminal database building blocks for this mouse
-+feature also have an experimental capability \fIxm\fP.
-+The \*(``xm\*('' capability describes the mouse response.
-+Currently there is no interpreter which would use this
-+information to make the mouse support completely data-driven.
-+.IP
-+\fIxm\fP shows the format of the mouse responses.
-+In this experimental capability, the parameters are
-+.RS 5
-+.TP 5
-+.I p1
-+y-ordinate
-+.TP 5
-+.I p2
-+x-ordinate
-+.TP 5
-+.I p3
-+button
-+.TP 5
-+.I p4
-+state, e.g., pressed or released
-+.TP 5
-+.I p5
-+y-ordinate starting region
-+.TP 5
-+.I p6
-+x-ordinate starting region
-+.TP 5
-+.I p7
-+y-ordinate ending region
-+.TP 5
-+.I p8
-+x-ordinate ending region
-+.RE
-+.IP
-+Here are examples from the terminal database for the most commonly used
-+xterm mouse protocols:
-+.IP
-+.nf
-+  xterm+x11mouse|X11 xterm mouse protocol,
-+          kmous=\\E[M, XM=\\E[?1000%?%p1%{1}%=%th%el%;,
-+          xm=\\E[M
-+             %?%p4%t%p3%e%{3}%;%'\ '%+%c
-+             %p2%'!'%+%c
-+             %p1%'!'%+%c,
-+
-+  xterm+sm+1006|xterm SGR-mouse,
-+          kmous=\\E[<, XM=\\E[?1006;1000%?%p1%{1}%=%th%el%;,
-+          xm=\\E[<%i%p3%d;
-+             %p1%d;
-+             %p2%d;
-+             %?%p4%tM%em%;,
-+.fi
- .
- .SS Extended key-definitions
- .PP
-Index: menu/m_driver.c
-Prereq:  1.32 
---- ncurses-6.1-20200111+/menu/m_driver.c	2016-03-26 21:51:52.000000000 +0000
-+++ ncurses-6.1-20200118/menu/m_driver.c	2020-01-18 17:02:13.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2016,2020 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -37,7 +37,7 @@
- 
- #include "menu.priv.h"
- 
--MODULE_ID("$Id: m_driver.c,v 1.32 2016/03/26 21:51:52 tom Exp $")
-+MODULE_ID("$Id: m_driver.c,v 1.33 2020/01/18 17:02:13 tom Exp $")
- 
- /* Macros */
- 
-@@ -138,7 +138,7 @@
-       /* we artificially position one item back, because in the do...while
-          loop we start with the next item. This means, that with a new
-          pattern search we always start the scan with the actual item. If
--         we do a NEXT_PATTERN oder PREV_PATTERN search, we start with the
-+         we do a NEXT_PATTERN or PREV_PATTERN search, we start with the
-          one after or before the actual item. */
-       if (--idx < 0)
- 	idx = menu->nitems - 1;
-Index: menu/m_global.c
-Prereq:  1.28 
---- ncurses-6.1-20200111+/menu/m_global.c	2014-03-15 20:37:22.000000000 +0000
-+++ ncurses-6.1-20200118/menu/m_global.c	2020-01-18 17:05:17.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2020 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -37,7 +37,7 @@
- 
- #include "menu.priv.h"
- 
--MODULE_ID("$Id: m_global.c,v 1.28 2014/03/15 20:37:22 tom Exp $")
-+MODULE_ID("$Id: m_global.c,v 1.29 2020/01/18 17:05:17 tom Exp $")
- 
- static char mark[] = "-";
- /* *INDENT-OFF* */
-@@ -53,7 +53,7 @@
-   0,				  /* length of widest description */
-   1,				  /* length of mark */
-   1,				  /* length of one item */
--  1,                              /* Spacing for descriptor */ 
-+  1,                              /* Spacing for descriptor */
-   1,                              /* Spacing for columns */
-   1,                              /* Spacing for rows */
-   (char *)0,			  /* buffer used to store match chars */
-@@ -68,7 +68,7 @@
-   0,				  /* Top row of menu */
-   (chtype)A_REVERSE,		  /* Attribute for selection */
-   (chtype)A_NORMAL,		  /* Attribute for nonselection */
--  (chtype)A_UNDERLINE,		  /* Attribute for inactive */	
-+  (chtype)A_UNDERLINE,		  /* Attribute for inactive */
-   ' ',  			  /* Pad character */
-   (Menu_Hook)0,			  /* Menu init */
-   (Menu_Hook)0,			  /* Menu term */
-@@ -77,7 +77,7 @@
-   (void *)0,			  /* userptr */
-   mark,				  /* mark */
-   ALL_MENU_OPTS,                  /* options */
--  0			          /* status */	    
-+  0			          /* status */
- };
- 
- NCURSES_EXPORT_VAR(ITEM) _nc_Default_Item = {
-@@ -98,9 +98,9 @@
- /* *INDENT-ON* */
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  static void ComputeMaximum_NameDesc_Lenths(MENU *menu)
--|   
-+|
- |   Description   :  Calculates the maximum name and description lengths
- |                    of the items connected to the menu
- |
-@@ -132,10 +132,10 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  static void ResetConnectionInfo(MENU *, ITEM **)
--|   
--|   Description   :  Reset all informations in the menu and the items in
-+|
-+|   Description   :  Reset all information in the menu and the items in
- |                    the item array that indicates a connection
- |
- |   Return Values :  -
-@@ -160,7 +160,7 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  bool _nc_Connect_Items(MENU *menu, ITEM **items)
- |
- |   Description   :  Connect the items in the item array to the menu.
-@@ -218,16 +218,16 @@
- 	}
-     }
- 
--  /* If we fall through to this point, we have to reset all items connection 
-+  /* If we fall through to this point, we have to reset all items connection
-      and inform about a reject connection */
-   ResetConnectionInfo(menu, items);
-   return (FALSE);
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  void _nc_Disconnect_Items(MENU *menu)
--|   
-+|
- |   Description   :  Disconnect the menus item array from the menu
- |
- |   Return Values :  -
-@@ -240,9 +240,9 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  int _nc_Calculate_Text_Width(const TEXT * item)
--|   
-+|
- |   Description   :  Calculate the number of columns for a TEXT.
- |
- |   Return Values :  the width
-@@ -328,9 +328,9 @@
- #endif
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  void _nc_Calculate_Item_Length_and_Width(MENU *menu)
--|   
-+|
- |   Description   :  Calculate the length of an item and the width of the
- |                    whole menu.
- |
-@@ -366,9 +366,9 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  void _nc_Link_Item(MENU *menu)
--|   
-+|
- |   Description   :  Statically calculate for every item its four neighbors.
- |                    This depends on the orientation of the menu. This
- |                    static approach simplifies navigation in the menu a lot.
-@@ -495,9 +495,9 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  void _nc_Show_Menu(const MENU* menu)
--|   
-+|
- |   Description   :  Update the window that is associated with the menu
- |
- |   Return Values :  -
-@@ -530,12 +530,12 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  void _nc_New_TopRow_and_CurrentItem(
--|                            MENU *menu, 
--|                            int new_toprow, 
-+|                            MENU *menu,
-+|                            int new_toprow,
- |                            ITEM *new_current_item)
--|   
-+|
- |   Description   :  Redisplay the menu so that the given row becomes the
- |                    top row and the given item becomes the new current
- |                    item.
-Index: menu/m_item_use.c
-Prereq:  1.17 
---- ncurses-6.1-20200111+/menu/m_item_use.c	2010-01-23 21:20:10.000000000 +0000
-+++ ncurses-6.1-20200118/menu/m_item_use.c	2020-01-18 17:02:13.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2020 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -37,14 +37,14 @@
- 
- #include "menu.priv.h"
- 
--MODULE_ID("$Id: m_item_use.c,v 1.17 2010/01/23 21:20:10 tom Exp $")
-+MODULE_ID("$Id: m_item_use.c,v 1.18 2020/01/18 17:02:13 tom Exp $")
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  int set_item_userptr(ITEM *item, void *userptr)
--|   
-+|
- |   Description   :  Set the pointer that is reserved in any item to store
--|                    application relevant informations.  
-+|                    application relevant information.
- |
- |   Return Values :  E_OK               - success
- +--------------------------------------------------------------------------*/
-@@ -57,11 +57,11 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  void *item_userptr(const ITEM *item)
--|   
-+|
- |   Description   :  Return the pointer that is reserved in any item to store
--|                    application relevant informations.
-+|                    application relevant information.
- |
- |   Return Values :  Value of the pointer. If no such pointer has been set,
- |                    NULL is returned.
-Index: menu/m_userptr.c
-Prereq:  1.17 
---- ncurses-6.1-20200111+/menu/m_userptr.c	2010-01-23 21:20:10.000000000 +0000
-+++ ncurses-6.1-20200118/menu/m_userptr.c	2020-01-18 17:04:37.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2020 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -37,14 +37,14 @@
- 
- #include "menu.priv.h"
- 
--MODULE_ID("$Id: m_userptr.c,v 1.17 2010/01/23 21:20:10 tom Exp $")
-+MODULE_ID("$Id: m_userptr.c,v 1.18 2020/01/18 17:04:37 tom Exp $")
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  int set_menu_userptr(MENU *menu, void *userptr)
--|   
-+|
- |   Description   :  Set the pointer that is reserved in any menu to store
--|                    application relevant informations.
-+|                    application relevant information.
- |
- |   Return Values :  E_OK         - success
- +--------------------------------------------------------------------------*/
-@@ -57,11 +57,11 @@
- }
- 
- /*---------------------------------------------------------------------------
--|   Facility      :  libnmenu  
-+|   Facility      :  libnmenu
- |   Function      :  void *menu_userptr(const MENU *menu)
--|   
-+|
- |   Description   :  Return the pointer that is reserved in any menu to
--|                    store application relevant informations.
-+|                    store application relevant information.
- |
- |   Return Values :  Value of the pointer. If no such pointer has been set,
- |                    NULL is returned
-Index: misc/emx.src
-Prereq:  1.9 
---- ncurses-6.1-20200111+/misc/emx.src	2006-04-22 21:46:17.000000000 +0000
-+++ ncurses-6.1-20200118/misc/emx.src	2020-01-18 19:04:22.000000000 +0000
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2020 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: emx.src,v 1.9 2006/04/22 21:46:17 tom Exp $
-+# $Id: emx.src,v 1.11 2020/01/18 19:04:22 tom Exp $
- # This is a reformatted copy of the terminfo source for OS/2 EMX from
- # Juan Jose Garcia Ripoll .
- # http://www.arrakis.es/~worm/
-@@ -183,7 +183,7 @@
- #
- # This completely describes the sequences specified in the DOS 2.1 ANSI.SYS
- # documentation (except for the keyboard key reassignment feature, which
--# doen't fit the  model well).  The klone+acs sequences were valid
-+# doesn't fit the  model well).  The klone+acs sequences were valid
- # though undocumented.  The  capability is untested but should work for
- # keys F1-F10 (%p1 values outside this range will yield unpredictable results).
- # From: Eric S. Raymond  Nov 7 1995
-@@ -330,7 +330,7 @@
- #	mb	<->	blink	turn on blinking
- #	md	<->	bold	turn on extra bright (bold) mode
- #	mr	<->	rev	turn on reverse video mode
--#	me	<->	sgr0	turn off all atributes
-+#	me	<->	sgr0	turn off all attributes
- #
- # On my terminal, \E[4m looks dim.
- ansi-emx|ANSI.SYS color,
-Index: misc/terminfo.src
---- ncurses-6.1-20200111+/misc/terminfo.src	2019-11-09 23:52:28.000000000 +0000
-+++ ncurses-6.1-20200118/misc/terminfo.src	2020-01-19 01:09:38.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.773 $
--#	$Date: 2019/11/09 23:52:28 $
-+#	$Revision: 1.779 $
-+#	$Date: 2020/01/19 01:09:38 $
- #
- # 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
-@@ -3453,7 +3453,7 @@
- #
- # According to its documentation, iTerm uses terminfo to obtain function key
- # definitions.  For example, if it is started with TERM=xterm, it uses key
--# definitons from that terminal description from the local OSX machine.  Those
-+# definitions from that terminal description from the local OSX machine.  Those
- # $TERM settings may be augmented using the bookmark and profile dialogs.
- # However, the behavior seen with tack does not agree with either the terminfo
- # description or the function keys in its "xterm" profile.
-@@ -5192,7 +5192,7 @@
- # no new information.
- xterm+x11mouse|X11 xterm mouse protocol,
- 	kmous=\E[M, XM=\E[?1000%?%p1%{1}%=%th%el%;,
--	xm=\E[M%?%p4%t3%e%p3%'\s'%+%c%;%p2%'!'%+%c%p1%'!'%+%c,
-+	xm=\E[M%?%p4%t%p3%e%{3}%;%'\s'%+%c%p2%'!'%+%c%p1%'!'%+%c,
- xterm-x11mouse|X11 mouse,
- 	use=xterm+x11mouse, use=xterm,
- 
-@@ -5255,10 +5255,11 @@
- # from the non-1005 responses.
- #
- # As an alternative (and fixing the longstanding limitation of X11 mouse
--# protocol regarding button-releases), I provided this:
-+# protocol regarding button-releases), I provided the 1006 mode, referring
-+# to it as "SGR 1006" since the replies resemble the SGR control string:
- xterm+sm+1006|xterm SGR-mouse,
- 	kmous=\E[<, XM=\E[?1006;1000%?%p1%{1}%=%th%el%;,
--	xm=\E[<%p1%d;%p2%d;%p3%d;%?%p4%tM%em%;,
-+	xm=\E[<%i%p3%d;%p1%d;%p2%d;%?%p4%tM%em%;,
- xterm-1006|xterm SGR-mouse,
- 	use=xterm+sm+1006, use=xterm,
- 
-@@ -5287,7 +5288,7 @@
- # These (xtermc and xtermm) are distributed with Solaris.  They refer to a
- # variant of xterm which is apparently no longer supported, but are interesting
- # because they illustrate SVr4 curses mouse controls - T.Dickey
--xtermm|xterm terminal emulator (monocrome),
-+xtermm|xterm terminal emulator (monochrome),
- 	OTbs, am, km, mir, msgr, xenl,
- 	btns#3, cols#80, it#8, lines#24,
- 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-@@ -6890,6 +6891,7 @@
- 
- #### Alacritty
- # https://github.com/jwilm/alacritty
-+# Version 0.4.0 (2019/11/25)
- # Version 0.3.3 (2019/08/03)
- # Version 0.2.1 (2018/10/03)
- # Project started in 2016/02, uses Rust and OpenGL, and in contrast to (most X
-@@ -6902,9 +6904,10 @@
- #	otherwise, passes wrapping test
- #	no DECSCNM
- #	identifies as a vt102
-+#	numeric keypad does not send expected codes (seen in 0.4.0)
- #	passes bce test
- #	vt220:
--#		ECH works (0.2.1 left text on right margin)
-+#		ECH works in 0.3.3 (0.2.1 left text on right margin)
- #		no SRM, DECSCA
- #	vt320:
- #		fails DECXCPR
-@@ -6920,12 +6923,16 @@
- #		no X10 mouse
- #		has normal and highlight mouse
- #		has any-event and button-event mouse
--#		cursor-position wrong after alternate-screen
-+#		+ does support SGR-mouse
-+#		+ does not correctly support focus in/out events (seen in 0.4.0)
-+#		cursor-position wrong after alternate-screen (fixed in 0.4.0)
- #		none of the dtterm controls work
- # tack:
- #	bell and flash do not work
-+#	blink does not work
- #	italics and crossed-out work (latter did not work in 0.2.1)
--#	function-keys work up to kf36; those using two modifiers do not work
-+#	function-keys work up (tested combinations which window manager allows)
-+#	treats meta as escape-prefix
- #
- # The program sources include "alacritty" and "alacritty-direct", which are
- # copied from "xterm-256color" and "xterm-direct" (but using semicolon for
-@@ -6937,14 +6944,14 @@
- alacritty-direct|alacritty with direct color indexing,
- 	use=xterm+indirect, use=alacritty+common,
- 
--# removed ech, since it fails vttest -TD
-+# cancel km, since it is not actually meta mode -TD
- # added ecma+strikeout in 0.3.3 -TD
- # added xterm+sl-twm in 0.3.3 -TD
- alacritty+common|base fragment for alacritty,
--	npc,
--	ech@, kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
--	use=ecma+index, use=xterm-basic, use=xterm+app,
--	use=ansi+rep, use=xterm+sm+1006, use=xterm+tmux,
-+	km@, npc,
-+	kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
-+	use=ecma+index, use=xterm+sm+1006, use=xterm-basic,
-+	use=xterm+app, use=ansi+rep, use=xterm+tmux,
- 	use=ecma+strikeout, use=xterm+sl-twm, use=ecma+italics,
- 	use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf2,
- 
-@@ -23140,8 +23147,8 @@
- 
- #### Masscomp consoles
- #
--# Masscomp has gone out of business.  Their product line was purchased by
--# comany in Georgia (US) called "XS International", parts and service may
-+# Masscomp has gone out of business.  Their product line was purchased by a
-+# company in Georgia (US) called "XS International", parts and service may
- # still be available through them.
- #
- 
-@@ -24477,7 +24484,7 @@
- #    goes to the first column of the "status line".
- # XM is a string capability which overrides ncurses's built-in string which
- #    enables/disables xterm mouse mode.
--# xm shows the format of the mouse responses.  Parameters are (from zero):
-+# xm shows the format of the mouse responses.  Parameters:
- #	p1 = y-ordinate
- #	p2 = x-ordinate
- #	p3 = button
-@@ -26420,4 +26427,12 @@
- #	+ reviewed st 0.8.2, updated some details -TD
- #	+ use ansi+rep several places -TD
- #
-+# 2020-01-12
-+#	+ update alacritty entries for 0.4.0 (prompted by patch by
-+#	  Christian Durr) -TD
-+#
-+# 2020-01-18
-+#	+ spelling fixes per codespell -TD
-+#	+ improve xm example for xterm+x11mouse, xterm+sm+1006 -TD
-+#
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: ncurses/README.IZ
-Prereq:  1.2 
---- ncurses-6.1-20200111+/ncurses/README.IZ	2006-04-22 23:13:05.000000000 +0000
-+++ ncurses-6.1-20200118/ncurses/README.IZ	2020-01-18 17:02:13.000000000 +0000
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- Copyright (c) 2002,2006 Free Software Foundation, Inc.                    --
-+-- Copyright (c) 2002-2006,2020 Free 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,11 +25,11 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: README.IZ,v 1.2 2006/04/22 23:13:05 tom Exp $
-+-- $Id: README.IZ,v 1.3 2020/01/18 17:02:13 tom Exp $
- ---------------------------------------------------------------------
- 
- Here is the patch.  I did no testing whatsoever with event watching
--requests present (I need some applications which exersize this before
-+requests present (I need some applications which exercise this before
- this, probably lynx ;-), but the code looks working "the normal way".
- 
- I had no way to test that the poll() branch compiles/works...
-Index: ncurses/build.priv.h
-Prereq:  1.10 
---- ncurses-6.1-20200111+/ncurses/build.priv.h	2019-05-11 14:14:00.000000000 +0000
-+++ ncurses-6.1-20200118/ncurses/build.priv.h	2020-01-18 17:03:32.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2010-2012,2019 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2010-2019,2020 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -31,11 +31,11 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: build.priv.h,v 1.10 2019/05/11 14:14:00 tom Exp $
-+ * $Id: build.priv.h,v 1.11 2020/01/18 17:03:32 tom Exp $
-  *
-  *	build.priv.h
-  *
-- *	This is a reduced version of curses.priv.h, for build-time utilties.
-+ *	This is a reduced version of curses.priv.h, for build-time utilities.
-  *	Because it has fewer dependencies, this simplifies cross-compiling.
-  *
-  */
-@@ -54,7 +54,7 @@
- #if USE_RCS_IDS
- #define MODULE_ID(id) static const char Ident[] = id;
- #else
--#define MODULE_ID(id) /*nothing*/
-+#define MODULE_ID(id)		/*nothing */
- #endif
- 
- #include 
-@@ -66,7 +66,7 @@
- 
- #include 
- 
--#include 	/* we'll use -Ipath directive to get the right one! */
-+#include 		/* we'll use -Ipath directive to get the right one! */
- 
- /* usually in  */
- #ifndef EXIT_SUCCESS
-@@ -89,20 +89,19 @@
- #define NCURSES_ARRAY(name) \
- 	NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, name)
- 
--NCURSES_ARRAY(boolnames);
--NCURSES_ARRAY(boolfnames);
--NCURSES_ARRAY(numnames);
--NCURSES_ARRAY(numfnames);
--NCURSES_ARRAY(strnames);
--NCURSES_ARRAY(strfnames);
-+    NCURSES_ARRAY(boolnames);
-+    NCURSES_ARRAY(boolfnames);
-+    NCURSES_ARRAY(numnames);
-+    NCURSES_ARRAY(numfnames);
-+    NCURSES_ARRAY(strnames);
-+    NCURSES_ARRAY(strfnames);
- #endif
- 
- #if NO_LEAKS
--NCURSES_EXPORT(void) _nc_names_leaks(void);
-+    NCURSES_EXPORT(void) _nc_names_leaks(void);
- #endif
- 
- #ifdef __cplusplus
- }
- #endif
--
--#endif /* CURSES_PRIV_H */
-+#endif				/* CURSES_PRIV_H */
-Index: ncurses/tinfo/make_hash.c
-Prereq:  1.29 
---- ncurses-6.1-20200111+/ncurses/tinfo/make_hash.c	2019-10-19 21:02:19.000000000 +0000
-+++ ncurses-6.1-20200118/ncurses/tinfo/make_hash.c	2020-01-18 17:02:38.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2019,2020 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -43,7 +43,7 @@
- 
- #include 
- 
--MODULE_ID("$Id: make_hash.c,v 1.29 2019/10/19 21:02:19 tom Exp $")
-+MODULE_ID("$Id: make_hash.c,v 1.30 2020/01/18 17:02:38 tom Exp $")
- 
- /*
-  *	_nc_make_hash_table()
-@@ -89,7 +89,7 @@
-  *
-  *	Computes the hashing function on the given string.
-  *
-- *	The current hash function is the sum of each consectutive pair
-+ *	The current hash function is the sum of each consecutive pair
-  *	of characters, taken as two-byte integers, mod HASHTABSIZE.
-  *
-  */
-Index: ncurses/tinfo/obsolete.c
-Prereq:  1.4 
---- ncurses-6.1-20200111+/ncurses/tinfo/obsolete.c	2016-09-10 18:39:51.000000000 +0000
-+++ ncurses-6.1-20200118/ncurses/tinfo/obsolete.c	2020-01-18 17:02:38.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2013-2014,2016 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2013-2016,2020 Free 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,10 +36,10 @@
- 
- #include 
- 
--MODULE_ID("$Id: obsolete.c,v 1.4 2016/09/10 18:39:51 tom Exp $")
-+MODULE_ID("$Id: obsolete.c,v 1.5 2020/01/18 17:02:38 tom Exp $")
- 
- /*
-- * Obsolete entrypoint retained for binary compatbility.
-+ * Obsolete entrypoint retained for binary compatibility.
-  */
- NCURSES_EXPORT(void)
- NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, int buffered)
-Index: ncurses/win32con/win_driver.c
-Prereq:  1.61 
---- ncurses-6.1-20200111+/ncurses/win32con/win_driver.c	2018-06-23 21:35:06.000000000 +0000
-+++ ncurses-6.1-20200118/ncurses/win32con/win_driver.c	2020-01-18 17:02:38.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2018,2020 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -54,7 +54,7 @@
- 
- #define CUR TerminalType(my_term).
- 
--MODULE_ID("$Id: win_driver.c,v 1.61 2018/06/23 21:35:06 tom Exp $")
-+MODULE_ID("$Id: win_driver.c,v 1.62 2020/01/18 17:02:38 tom Exp $")
- 
- #ifndef __GNUC__
- #  error We need GCC to compile for MinGW
-@@ -1973,7 +1973,7 @@
- 
- /*   This is used when running in terminfo mode to discover,
-      whether or not the "terminal" is actually a Windows
--     Console. It's the responsibilty of the console to deal
-+     Console. It's the responsibility of the console to deal
-      with the terminal escape sequences that are sent by
-      terminfo.
-  */
-@@ -2162,7 +2162,7 @@
- static bool
- InitConsole(void)
- {
--    /* initalize once, or not at all */
-+    /* initialize once, or not at all */
-     if (!console_initialized) {
- 	int i;
- 	DWORD num_buttons;
-Index: package/debian-mingw/changelog
---- ncurses-6.1-20200111+/package/debian-mingw/changelog	2020-01-11 10:59:50.000000000 +0000
-+++ ncurses-6.1-20200118/package/debian-mingw/changelog	2020-01-18 10:27:03.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20200111) unstable; urgency=low
-+ncurses6 (6.1+20200118) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 11 Jan 2020 05:59:50 -0500
-+ -- Thomas E. Dickey   Sat, 18 Jan 2020 05:27:03 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.1-20200111+/package/debian-mingw64/changelog	2020-01-11 10:59:50.000000000 +0000
-+++ ncurses-6.1-20200118/package/debian-mingw64/changelog	2020-01-18 10:27:03.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20200111) unstable; urgency=low
-+ncurses6 (6.1+20200118) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 11 Jan 2020 05:59:50 -0500
-+ -- Thomas E. Dickey   Sat, 18 Jan 2020 05:27:03 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.1-20200111+/package/debian/changelog	2020-01-11 10:59:50.000000000 +0000
-+++ ncurses-6.1-20200118/package/debian/changelog	2020-01-18 10:27:03.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.1+20200111) unstable; urgency=low
-+ncurses6 (6.1+20200118) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey   Sat, 11 Jan 2020 05:59:50 -0500
-+ -- Thomas E. Dickey   Sat, 18 Jan 2020 05:27:03 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.369 
---- ncurses-6.1-20200111+/package/mingw-ncurses.nsi	2020-01-11 10:59:50.000000000 +0000
-+++ ncurses-6.1-20200118/package/mingw-ncurses.nsi	2020-01-18 10:27:03.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.369 2020/01/11 10:59:50 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.370 2020/01/18 10:27:03 tom Exp $
- 
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"
- !define VERSION_MINOR "1"
- !define VERSION_YYYY  "2020"
--!define VERSION_MMDD  "0111"
-+!define VERSION_MMDD  "0118"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
- 
- !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.1-20200111+/package/mingw-ncurses.spec	2020-01-11 10:59:50.000000000 +0000
-+++ ncurses-6.1-20200118/package/mingw-ncurses.spec	2020-01-18 10:27:03.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.1
--Release: 20200111
-+Release: 20200118
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.1-20200111+/package/ncurses.spec	2020-01-11 10:59:50.000000000 +0000
-+++ ncurses-6.1-20200118/package/ncurses.spec	2020-01-18 10:27:03.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.1
--Release: 20200111
-+Release: 20200118
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncursest.spec
---- ncurses-6.1-20200111+/package/ncursest.spec	2020-01-11 10:59:50.000000000 +0000
-+++ ncurses-6.1-20200118/package/ncursest.spec	2020-01-18 10:27:03.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: Curses library with POSIX thread support.
- Name: ncursest6
- Version: 6.1
--Release: 20200111
-+Release: 20200118
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/capconvert
-Prereq:  1.7 
---- ncurses-6.1-20200111+/progs/capconvert	2019-03-02 22:51:42.000000000 +0000
-+++ ncurses-6.1-20200118/progs/capconvert	2020-01-18 17:02:38.000000000 +0000
-@@ -1,6 +1,6 @@
- #!/bin/sh
- ##############################################################################
--# Copyright (c) 1998-2017,2019 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2019,2020 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -26,7 +26,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: capconvert,v 1.7 2019/03/02 22:51:42 tom Exp $
-+# $Id: capconvert,v 1.8 2020/01/18 17:02:38 tom Exp $
- #
- # capconvert -- automated conversion from termcap to terminfo
- #
-@@ -179,7 +179,7 @@
- 		echo "I am going to assume this is the terminfo source included with"
- 		echo "the ncurses distribution.  If this assumption is wrong, please"
- 		echo "interrupt me now!  OK to continue?"
--		read ans;
-+		read answer;
- 	;;
- 	2)
- 		echo "I see more than one possible terminfo source.  Here they are:"
-@@ -251,7 +251,7 @@
- 	echo "Done."
- 	echo "Note that editing TERMCAP will no longer change the data curses sees."
- fi
--echo "To do that, decompile the terminal decription you want with infocmp(1),"
-+echo "To do that, decompile the terminal description you want with infocmp(1),"
- echo "edit to taste, and recompile using tic(1)."
- 
- # capconvert ends here
-Index: test/aclocal.m4
-Prereq:  1.169 
---- ncurses-6.1-20200111+/test/aclocal.m4	2020-01-12 00:01:40.000000000 +0000
-+++ ncurses-6.1-20200118/test/aclocal.m4	2020-01-18 17:30:44.000000000 +0000
-@@ -26,7 +26,7 @@
- dnl authorization.                                                           *
- dnl***************************************************************************
- dnl
--dnl $Id: aclocal.m4,v 1.169 2020/01/12 00:01:40 tom Exp $
-+dnl $Id: aclocal.m4,v 1.172 2020/01/18 17:30:44 tom Exp $
- dnl
- dnl Author: Thomas E. Dickey
- dnl
-@@ -3350,9 +3350,9 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SIG_ATOMIC_T version: 3 updated: 2012/10/04 20:12:20
-+dnl CF_SIG_ATOMIC_T version: 4 updated: 2020/01/18 12:30:44
- dnl ---------------
--dnl signal handler, but there are some gcc depedencies in that recommendation.
-+dnl signal handler, but there are some gcc dependencies in that recommendation.
- dnl Try anyway.
- AC_DEFUN([CF_SIG_ATOMIC_T],
- [
-@@ -4216,7 +4216,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_X_ATHENA_CPPFLAGS version: 7 updated: 2020/01/11 17:15:41
-+dnl CF_X_ATHENA_CPPFLAGS version: 8 updated: 2020/01/16 05:21:56
- dnl --------------------
- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
- dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
-@@ -4249,15 +4249,15 @@
- 		AC_MSG_RESULT($cf_result)
- 		CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
- 		if test "$cf_result" = yes ; then
--			cf_x_athena_inc=$cf_path
-+			test "$cf_path"  = default && cf_x_athena_inc=default
-+			test "$cf_path" != default && cf_x_athena_inc=$cf_path/include
- 			break
- 		fi
- 	fi
- done
- 
- if test -z "$cf_x_athena_inc" ; then
--	AC_MSG_WARN(
--[Unable to successfully find Athena header files with test program])
-+	AC_MSG_WARN([Unable to find Athena header files])
- elif test "$cf_x_athena_inc" != default ; then
- 	CF_APPEND_TEXT(CPPFLAGS,-I$cf_x_athena_inc)
- fi
-Index: test/configure
---- ncurses-6.1-20200111+/test/configure	2020-01-12 00:02:42.000000000 +0000
-+++ ncurses-6.1-20200118/test/configure	2020-01-18 16:40:29.000000000 +0000
-@@ -14712,15 +14712,16 @@
- CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
- 
- 		if test "$cf_result" = yes ; then
--			cf_x_athena_inc=$cf_path
-+			test "$cf_path"  = default && cf_x_athena_inc=default
-+			test "$cf_path" != default && cf_x_athena_inc=$cf_path/include
- 			break
- 		fi
- 	fi
- done
- 
- if test -z "$cf_x_athena_inc" ; then
--	{ echo "$as_me:14722: WARNING: Unable to successfully find Athena header files with test program" >&5
--echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
-+	{ echo "$as_me:14723: WARNING: Unable to find Athena header files" >&5
-+echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
- elif test "$cf_x_athena_inc" != default ; then
- 
- 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
-@@ -14784,10 +14785,10 @@
- done
- LIBS="$cf_add_libs"
- 
--		echo "$as_me:14787: checking for $cf_test in $cf_libs" >&5
-+		echo "$as_me:14788: checking for $cf_test in $cf_libs" >&5
- echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 14790 "configure"
-+#line 14791 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -14803,16 +14804,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14806: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14807: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14809: \$? = $ac_status" >&5
-+  echo "$as_me:14810: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14812: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14813: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14815: \$? = $ac_status" >&5
-+  echo "$as_me:14816: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -14821,7 +14822,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:14824: result: $cf_result" >&5
-+		echo "$as_me:14825: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
-@@ -14838,7 +14839,7 @@
- done
- 
- if test -z "$cf_x_athena_lib" ; then
--	{ { echo "$as_me:14841: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
-+	{ { echo "$as_me:14842: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
- echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -14872,7 +14873,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:14875: checking for $ac_word" >&5
-+echo "$as_me:14876: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14887,7 +14888,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
--echo "$as_me:14890: found $ac_dir/$ac_word" >&5
-+echo "$as_me:14891: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -14895,10 +14896,10 @@
- fi
- XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
- if test -n "$XCURSES_CONFIG"; then
--  echo "$as_me:14898: result: $XCURSES_CONFIG" >&5
-+  echo "$as_me:14899: result: $XCURSES_CONFIG" >&5
- echo "${ECHO_T}$XCURSES_CONFIG" >&6
- else
--  echo "$as_me:14901: result: no" >&5
-+  echo "$as_me:14902: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -14911,7 +14912,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:14914: checking for $ac_word" >&5
-+echo "$as_me:14915: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14926,7 +14927,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
--echo "$as_me:14929: found $ac_dir/$ac_word" >&5
-+echo "$as_me:14930: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -14934,10 +14935,10 @@
- fi
- ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
- if test -n "$ac_ct_XCURSES_CONFIG"; then
--  echo "$as_me:14937: result: $ac_ct_XCURSES_CONFIG" >&5
-+  echo "$as_me:14938: result: $ac_ct_XCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
- else
--  echo "$as_me:14940: result: no" >&5
-+  echo "$as_me:14941: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -15072,7 +15073,7 @@
- 
- test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
- 
--echo "${as_me:-configure}:15075: testing checking additions to CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:15076: testing checking additions to CFLAGS ..." 1>&5
- 
- cf_check_cflags="$CFLAGS"
- cf_check_cppflags="$CPPFLAGS"
-@@ -15157,7 +15158,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:15160: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:15161: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
- 	CFLAGS="${CFLAGS}$cf_new_cflags"
-@@ -15167,7 +15168,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:15170: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:15171: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
- 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
-@@ -15177,7 +15178,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:15180: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:15181: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
- 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
-@@ -15186,7 +15187,7 @@
- 
- if test "x$cf_check_cflags" != "x$CFLAGS" ; then
- cat >conftest.$ac_ext <<_ACEOF
--#line 15189 "configure"
-+#line 15190 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -15198,16 +15199,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15201: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15202: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15204: \$? = $ac_status" >&5
-+  echo "$as_me:15205: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15207: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15208: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15210: \$? = $ac_status" >&5
-+  echo "$as_me:15211: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -15215,12 +15216,12 @@
- cat conftest.$ac_ext >&5
- test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
- 
--echo "${as_me:-configure}:15218: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:15219: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
- 
- 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
- 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
- 
--echo "${as_me:-configure}:15223: testing but keeping change to \$CPPFLAGS ..." 1>&5
-+echo "${as_me:-configure}:15224: testing but keeping change to \$CPPFLAGS ..." 1>&5
- 
- 	 fi
- 	 CFLAGS="$cf_check_flags"
-@@ -15228,7 +15229,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
- 
--echo "$as_me:15231: checking for XOpenDisplay in -lX11" >&5
-+echo "$as_me:15232: checking for XOpenDisplay in -lX11" >&5
- echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
- if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15236,7 +15237,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15239 "configure"
-+#line 15240 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15255,16 +15256,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15258: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15259: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15261: \$? = $ac_status" >&5
-+  echo "$as_me:15262: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15264: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15265: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15267: \$? = $ac_status" >&5
-+  echo "$as_me:15268: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_X11_XOpenDisplay=yes
- else
-@@ -15275,7 +15276,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15278: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+echo "$as_me:15279: result: $ac_cv_lib_X11_XOpenDisplay" >&5
- echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
- if test $ac_cv_lib_X11_XOpenDisplay = yes; then
- 
-@@ -15297,7 +15298,7 @@
- 
- fi
- 
--echo "$as_me:15300: checking for XCurses library" >&5
-+echo "$as_me:15301: checking for XCurses library" >&5
- echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
- if test "${cf_cv_lib_XCurses+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15320,7 +15321,7 @@
- LIBS="$cf_add_libs"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15323 "configure"
-+#line 15324 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -15335,16 +15336,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15338: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15339: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15341: \$? = $ac_status" >&5
-+  echo "$as_me:15342: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15344: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15345: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15347: \$? = $ac_status" >&5
-+  echo "$as_me:15348: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_lib_XCurses=yes
- else
-@@ -15355,7 +15356,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:15358: result: $cf_cv_lib_XCurses" >&5
-+echo "$as_me:15359: result: $cf_cv_lib_XCurses" >&5
- echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
- 
- fi
-@@ -15370,23 +15371,23 @@
- #define XCURSES 1
- EOF
- 
--	echo "$as_me:15373: checking for xcurses.h" >&5
-+	echo "$as_me:15374: checking for xcurses.h" >&5
- echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
- if test "${ac_cv_header_xcurses_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15379 "configure"
-+#line 15380 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:15383: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15384: \"$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:15389: \$? = $ac_status" >&5
-+  echo "$as_me:15390: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15405,7 +15406,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15408: result: $ac_cv_header_xcurses_h" >&5
-+echo "$as_me:15409: result: $ac_cv_header_xcurses_h" >&5
- echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
- if test $ac_cv_header_xcurses_h = yes; then
- 
-@@ -15416,14 +15417,14 @@
- fi
- 
- else
--	{ { echo "$as_me:15419: error: Cannot link with XCurses" >&5
-+	{ { echo "$as_me:15420: error: Cannot link with XCurses" >&5
- echo "$as_me: error: Cannot link with XCurses" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- 	;;
- (*)
--	{ { echo "$as_me:15426: error: unexpected screen-value: $cf_cv_screen" >&5
-+	{ { echo "$as_me:15427: error: unexpected screen-value: $cf_cv_screen" >&5
- echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -15431,7 +15432,7 @@
- 
- : ${cf_nculib_root:=$cf_cv_screen}
- as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
--echo "$as_me:15434: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
-+echo "$as_me:15435: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
- echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15439,7 +15440,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_nculib_root  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15442 "configure"
-+#line 15443 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15458,16 +15459,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15461: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15462: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15464: \$? = $ac_status" >&5
-+  echo "$as_me:15465: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15467: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15468: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15470: \$? = $ac_status" >&5
-+  echo "$as_me:15471: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -15478,7 +15479,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15481: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15482: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-   cf_cv_ncurses_pthreads=yes
-@@ -15513,7 +15514,7 @@
- 	;;
- esac
- 
--echo "$as_me:15516: checking for X11 rgb file" >&5
-+echo "$as_me:15517: checking for X11 rgb file" >&5
- echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
- 
- # Check whether --with-x11-rgb or --without-x11-rgb was given.
-@@ -15577,7 +15578,7 @@
- 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:15580: error: expected a pathname, not \"$cf_path\"" >&5
-+	{ { echo "$as_me:15581: error: expected a pathname, not \"$cf_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -15585,7 +15586,7 @@
- 
- fi
- 
--echo "$as_me:15588: result: $RGB_PATH" >&5
-+echo "$as_me:15589: result: $RGB_PATH" >&5
- echo "${ECHO_T}$RGB_PATH" >&6
- 
- cat >>confdefs.h <&5
-+echo "$as_me:15630: checking if you want to check for panel functions" >&5
- echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
- 
- # Check whether --enable-panel or --disable-panel was given.
-@@ -15643,7 +15644,7 @@
- 	cf_enable_panel=$cf_default_panel
- 
- fi;
--echo "$as_me:15646: result: $cf_enable_panel" >&5
-+echo "$as_me:15647: result: $cf_enable_panel" >&5
- echo "${ECHO_T}$cf_enable_panel" >&6
- if test $cf_enable_panel = yes
- then
-@@ -15654,13 +15655,13 @@
- if test "x${NCURSES_CONFIG_PKG}" = xnone; then
- 	:
- elif test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:15657: checking pkg-config for panel$cf_cv_libtype" >&5
-+	echo "$as_me:15658: checking pkg-config for panel$cf_cv_libtype" >&5
- echo $ECHO_N "checking pkg-config for panel$cf_cv_libtype... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists panel$cf_cv_libtype ; then
--		echo "$as_me:15660: result: yes" >&5
-+		echo "$as_me:15661: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:15663: checking if the panel$cf_cv_libtype package files work" >&5
-+		echo "$as_me:15664: checking if the panel$cf_cv_libtype package files work" >&5
- echo $ECHO_N "checking if the panel$cf_cv_libtype package files work... $ECHO_C" >&6
- 
- 		cf_save_CPPFLAGS="$CPPFLAGS"
-@@ -15781,7 +15782,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15784 "configure"
-+#line 15785 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -15793,37 +15794,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15796: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15797: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15799: \$? = $ac_status" >&5
-+  echo "$as_me:15800: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15802: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15803: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15805: \$? = $ac_status" >&5
-+  echo "$as_me:15806: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_curses_lib=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15811 "configure"
-+#line 15812 "configure"
- #include "confdefs.h"
- #include 
- 				int main(void)
- 				{ (void) new_panel ( 0 ); return 0; }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15818: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15819: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15821: \$? = $ac_status" >&5
-+  echo "$as_me:15822: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15823: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15824: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15826: \$? = $ac_status" >&5
-+  echo "$as_me:15827: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_curses_lib=yes
- else
-@@ -15840,7 +15841,7 @@
- cf_have_curses_lib=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:15843: result: $cf_have_curses_lib" >&5
-+		echo "$as_me:15844: result: $cf_have_curses_lib" >&5
- echo "${ECHO_T}$cf_have_curses_lib" >&6
- 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
- 		if test "$cf_have_curses_lib" != "yes"
-@@ -15860,7 +15861,7 @@
- fi
- if test "$cf_have_curses_lib" = no; then
- 	as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
--echo "$as_me:15863: checking for new_panel in -lpanel$cf_cv_libtype" >&5
-+echo "$as_me:15864: checking for new_panel in -lpanel$cf_cv_libtype" >&5
- echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15868,7 +15869,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpanel$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15871 "configure"
-+#line 15872 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15887,16 +15888,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15890: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15891: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15893: \$? = $ac_status" >&5
-+  echo "$as_me:15894: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15896: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15897: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15899: \$? = $ac_status" >&5
-+  echo "$as_me:15900: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -15907,7 +15908,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15910: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15911: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -15940,7 +15941,7 @@
- 	cf_curses_headers="$cf_curses_headers panel.h"
- fi
- 
--echo "$as_me:15943: checking if you want to check for menu functions" >&5
-+echo "$as_me:15944: checking if you want to check for menu functions" >&5
- echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
- 
- # Check whether --enable-menu or --disable-menu was given.
-@@ -15957,7 +15958,7 @@
- 	cf_enable_menu=$cf_default_menu
- 
- fi;
--echo "$as_me:15960: result: $cf_enable_menu" >&5
-+echo "$as_me:15961: result: $cf_enable_menu" >&5
- echo "${ECHO_T}$cf_enable_menu" >&6
- if test $cf_enable_menu = yes
- then
-@@ -15966,14 +15967,14 @@
- 		;;
- 	(curses*)
- 
--echo "$as_me:15969: checking for NetBSD menu.h" >&5
-+echo "$as_me:15970: checking for NetBSD menu.h" >&5
- echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
- if test "${cf_cv_netbsd_menu_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15976 "configure"
-+#line 15977 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15991,16 +15992,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15994: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15995: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15997: \$? = $ac_status" >&5
-+  echo "$as_me:15998: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16001: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16003: \$? = $ac_status" >&5
-+  echo "$as_me:16004: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_netbsd_menu_h=yes
- 
-@@ -16012,7 +16013,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:16015: result: $cf_cv_netbsd_menu_h" >&5
-+echo "$as_me:16016: result: $cf_cv_netbsd_menu_h" >&5
- echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
- 
- test "$cf_cv_netbsd_menu_h" = yes &&
-@@ -16029,13 +16030,13 @@
- if test "x${NCURSES_CONFIG_PKG}" = xnone; then
- 	:
- elif test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:16032: checking pkg-config for menu$cf_cv_libtype" >&5
-+	echo "$as_me:16033: checking pkg-config for menu$cf_cv_libtype" >&5
- echo $ECHO_N "checking pkg-config for menu$cf_cv_libtype... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists menu$cf_cv_libtype ; then
--		echo "$as_me:16035: result: yes" >&5
-+		echo "$as_me:16036: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:16038: checking if the menu$cf_cv_libtype package files work" >&5
-+		echo "$as_me:16039: checking if the menu$cf_cv_libtype package files work" >&5
- echo $ECHO_N "checking if the menu$cf_cv_libtype package files work... $ECHO_C" >&6
- 
- 		cf_save_CPPFLAGS="$CPPFLAGS"
-@@ -16156,7 +16157,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16159 "configure"
-+#line 16160 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -16168,37 +16169,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16171: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16172: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16174: \$? = $ac_status" >&5
-+  echo "$as_me:16175: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16177: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16178: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16180: \$? = $ac_status" >&5
-+  echo "$as_me:16181: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_curses_lib=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16186 "configure"
-+#line 16187 "configure"
- #include "confdefs.h"
- #include 
- 				int main(void)
- 				{ (void) menu_driver ( 0,0 ); return 0; }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16193: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16194: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16196: \$? = $ac_status" >&5
-+  echo "$as_me:16197: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16198: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16199: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16201: \$? = $ac_status" >&5
-+  echo "$as_me:16202: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_curses_lib=yes
- else
-@@ -16215,7 +16216,7 @@
- cf_have_curses_lib=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:16218: result: $cf_have_curses_lib" >&5
-+		echo "$as_me:16219: result: $cf_have_curses_lib" >&5
- echo "${ECHO_T}$cf_have_curses_lib" >&6
- 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
- 		if test "$cf_have_curses_lib" != "yes"
-@@ -16235,7 +16236,7 @@
- fi
- if test "$cf_have_curses_lib" = no; then
- 	as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
--echo "$as_me:16238: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
-+echo "$as_me:16239: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
- echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16243,7 +16244,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmenu$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16246 "configure"
-+#line 16247 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16262,16 +16263,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16265: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16266: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16268: \$? = $ac_status" >&5
-+  echo "$as_me:16269: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16271: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16272: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16274: \$? = $ac_status" >&5
-+  echo "$as_me:16275: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -16282,7 +16283,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16285: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:16286: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -16315,7 +16316,7 @@
- 	cf_curses_headers="$cf_curses_headers menu.h"
- fi
- 
--echo "$as_me:16318: checking if you want to check for form functions" >&5
-+echo "$as_me:16319: checking if you want to check for form functions" >&5
- echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
- 
- # Check whether --enable-form or --disable-form was given.
-@@ -16332,7 +16333,7 @@
- 	cf_enable_form=$cf_default_form
- 
- fi;
--echo "$as_me:16335: result: $cf_enable_form" >&5
-+echo "$as_me:16336: result: $cf_enable_form" >&5
- echo "${ECHO_T}$cf_enable_form" >&6
- if test $cf_enable_form = yes
- then
-@@ -16341,14 +16342,14 @@
- 		;;
- 	(curses*)
- 
--echo "$as_me:16344: checking for NetBSD form.h" >&5
-+echo "$as_me:16345: checking for NetBSD form.h" >&5
- echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
- if test "${cf_cv_netbsd_form_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16351 "configure"
-+#line 16352 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -16367,16 +16368,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16370: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16371: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16373: \$? = $ac_status" >&5
-+  echo "$as_me:16374: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16376: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16377: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16379: \$? = $ac_status" >&5
-+  echo "$as_me:16380: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_netbsd_form_h=yes
- 
-@@ -16388,7 +16389,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:16391: result: $cf_cv_netbsd_form_h" >&5
-+echo "$as_me:16392: result: $cf_cv_netbsd_form_h" >&5
- echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
- 
- test "$cf_cv_netbsd_form_h" = yes &&
-@@ -16405,13 +16406,13 @@
- if test "x${NCURSES_CONFIG_PKG}" = xnone; then
- 	:
- elif test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:16408: checking pkg-config for form$cf_cv_libtype" >&5
-+	echo "$as_me:16409: checking pkg-config for form$cf_cv_libtype" >&5
- echo $ECHO_N "checking pkg-config for form$cf_cv_libtype... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists form$cf_cv_libtype ; then
--		echo "$as_me:16411: result: yes" >&5
-+		echo "$as_me:16412: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:16414: checking if the form$cf_cv_libtype package files work" >&5
-+		echo "$as_me:16415: checking if the form$cf_cv_libtype package files work" >&5
- echo $ECHO_N "checking if the form$cf_cv_libtype package files work... $ECHO_C" >&6
- 
- 		cf_save_CPPFLAGS="$CPPFLAGS"
-@@ -16532,7 +16533,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16535 "configure"
-+#line 16536 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -16544,37 +16545,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16547: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16548: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16550: \$? = $ac_status" >&5
-+  echo "$as_me:16551: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16553: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16554: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16556: \$? = $ac_status" >&5
-+  echo "$as_me:16557: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_curses_lib=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16562 "configure"
-+#line 16563 "configure"
- #include "confdefs.h"
- #include 
- 				int main(void)
- 				{ (void) form_driver ( 0,0 ); return 0; }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16569: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16570: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16572: \$? = $ac_status" >&5
-+  echo "$as_me:16573: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16574: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16575: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16577: \$? = $ac_status" >&5
-+  echo "$as_me:16578: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_curses_lib=yes
- else
-@@ -16591,7 +16592,7 @@
- cf_have_curses_lib=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:16594: result: $cf_have_curses_lib" >&5
-+		echo "$as_me:16595: result: $cf_have_curses_lib" >&5
- echo "${ECHO_T}$cf_have_curses_lib" >&6
- 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
- 		if test "$cf_have_curses_lib" != "yes"
-@@ -16611,7 +16612,7 @@
- fi
- if test "$cf_have_curses_lib" = no; then
- 	as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
--echo "$as_me:16614: checking for form_driver in -lform$cf_cv_libtype" >&5
-+echo "$as_me:16615: checking for form_driver in -lform$cf_cv_libtype" >&5
- echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16619,7 +16620,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lform$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16622 "configure"
-+#line 16623 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16638,16 +16639,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16641: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16642: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16644: \$? = $ac_status" >&5
-+  echo "$as_me:16645: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16647: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16648: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16650: \$? = $ac_status" >&5
-+  echo "$as_me:16651: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -16658,7 +16659,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16661: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:16662: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -16696,23 +16697,23 @@
- for ac_header in $cf_curses_headers
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16699: checking for $ac_header" >&5
-+echo "$as_me:16700: 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 16705 "configure"
-+#line 16706 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16709: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16710: \"$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:16715: \$? = $ac_status" >&5
-+  echo "$as_me:16716: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16731,7 +16732,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16734: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16735: 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 <&5
-+echo "$as_me:16745: 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 16750 "configure"
-+#line 16751 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -16755,13 +16756,13 @@
- #include 
- 
- _ACEOF
--if { (eval echo "$as_me:16758: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16759: \"$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:16764: \$? = $ac_status" >&5
-+  echo "$as_me:16765: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16783,7 +16784,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 16786 "configure"
-+#line 16787 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -16801,7 +16802,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 16804 "configure"
-+#line 16805 "configure"
- #include "confdefs.h"
- #include 
- 
-@@ -16822,7 +16823,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16825 "configure"
-+#line 16826 "configure"
- #include "confdefs.h"
- #include 
- #if ((' ' & 0x0FF) == 0x020)
-@@ -16848,15 +16849,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16851: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16852: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16854: \$? = $ac_status" >&5
-+  echo "$as_me:16855: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16856: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16857: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16859: \$? = $ac_status" >&5
-+  echo "$as_me:16860: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -16869,7 +16870,7 @@
- fi
- fi
- fi
--echo "$as_me:16872: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:16873: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -16879,13 +16880,13 @@
- 
- fi
- 
--echo "$as_me:16882: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:16883: 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 16888 "configure"
-+#line 16889 "configure"
- #include "confdefs.h"
- #include 
- #include 
-@@ -16901,16 +16902,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16904: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16905: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16907: \$? = $ac_status" >&5
-+  echo "$as_me:16908: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16910: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16911: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16913: \$? = $ac_status" >&5
-+  echo "$as_me:16914: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -16920,7 +16921,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:16923: result: $ac_cv_header_time" >&5
-+echo "$as_me:16924: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -16944,23 +16945,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16947: checking for $ac_header" >&5
-+echo "$as_me:16948: 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 16953 "configure"
-+#line 16954 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16957: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16958: \"$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:16963: \$? = $ac_status" >&5
-+  echo "$as_me:16964: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16979,7 +16980,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16982: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16983: 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 <&5
-+echo "$as_me:16996: 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 17001 "configure"
-+#line 17002 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:17005: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17006: \"$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:17011: \$? = $ac_status" >&5
-+  echo "$as_me:17012: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -17027,7 +17028,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:17030: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:17031: 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 <&5
-+echo "$as_me:17041: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17047,7 +17048,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 17050 "configure"
-+#line 17051 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -17060,16 +17061,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17063: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17064: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17066: \$? = $ac_status" >&5
-+  echo "$as_me:17067: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17069: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17070: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17072: \$? = $ac_status" >&5
-+  echo "$as_me:17073: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -17081,7 +17082,7 @@
- done
- 
- fi
--echo "$as_me:17084: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:17085: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -17106,13 +17107,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:17109: checking for $ac_func" >&5
-+echo "$as_me:17110: 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 17115 "configure"
-+#line 17116 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -17143,16 +17144,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17146: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17147: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17149: \$? = $ac_status" >&5
-+  echo "$as_me:17150: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17152: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17153: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17155: \$? = $ac_status" >&5
-+  echo "$as_me:17156: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -17162,7 +17163,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17165: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:17166: 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 <&5
-+echo "$as_me:17177: checking if we can use termcap.h" >&5
- echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
- if test "${cf_cv_have_termcap_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17183 "configure"
-+#line 17184 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17201,16 +17202,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17204: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17205: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17207: \$? = $ac_status" >&5
-+  echo "$as_me:17208: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17210: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17211: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17213: \$? = $ac_status" >&5
-+  echo "$as_me:17214: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_termcap_h=yes
- else
-@@ -17220,7 +17221,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17223: result: $cf_cv_have_termcap_h" >&5
-+echo "$as_me:17224: result: $cf_cv_have_termcap_h" >&5
- echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
- if test "x$cf_cv_have_termcap_h" = xyes
- then
-@@ -17230,14 +17231,14 @@
- EOF
- 
- else
--echo "$as_me:17233: checking if we can use ncurses/termcap.h" >&5
-+echo "$as_me:17234: checking if we can use ncurses/termcap.h" >&5
- echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
- if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17240 "configure"
-+#line 17241 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17258,16 +17259,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17261: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17262: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17264: \$? = $ac_status" >&5
-+  echo "$as_me:17265: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17268: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17270: \$? = $ac_status" >&5
-+  echo "$as_me:17271: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_ncurses_termcap_h=yes
- else
-@@ -17277,7 +17278,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17280: result: $cf_cv_have_ncurses_termcap_h" >&5
-+echo "$as_me:17281: result: $cf_cv_have_ncurses_termcap_h" >&5
- echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
- test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -17287,7 +17288,7 @@
- fi
- 
- if test "x$ac_cv_func_getopt" = xno; then
--	{ { echo "$as_me:17290: error: getopt is required for building programs" >&5
-+	{ { echo "$as_me:17291: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -17306,13 +17307,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:17309: checking for $ac_func" >&5
-+echo "$as_me:17310: 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 17315 "configure"
-+#line 17316 "configure"
- #include "confdefs.h"
- #define $ac_func autoconf_temporary
- #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
-@@ -17343,16 +17344,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17346: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17347: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17349: \$? = $ac_status" >&5
-+  echo "$as_me:17350: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17352: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17353: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17355: \$? = $ac_status" >&5
-+  echo "$as_me:17356: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -17362,7 +17363,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17365: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:17366: 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 <&5
-+echo "$as_me:17378: checking definition to turn on extended curses functions" >&5
- echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
- if test "${cf_cv_need_xopen_extension+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17382,7 +17383,7 @@
- 
- cf_cv_need_xopen_extension=unknown
- cat >conftest.$ac_ext <<_ACEOF
--#line 17385 "configure"
-+#line 17386 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -17408,16 +17409,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17411: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17412: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17414: \$? = $ac_status" >&5
-+  echo "$as_me:17415: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17417: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17418: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17420: \$? = $ac_status" >&5
-+  echo "$as_me:17421: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_xopen_extension=none
- else
-@@ -17427,7 +17428,7 @@
- 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 17430 "configure"
-+#line 17431 "configure"
- #include "confdefs.h"
- 
- #define $cf_try_xopen_extension 1
-@@ -17449,16 +17450,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17452: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17453: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17455: \$? = $ac_status" >&5
-+  echo "$as_me:17456: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17458: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17459: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17461: \$? = $ac_status" >&5
-+  echo "$as_me:17462: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
- else
-@@ -17472,7 +17473,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:17475: result: $cf_cv_need_xopen_extension" >&5
-+echo "$as_me:17476: result: $cf_cv_need_xopen_extension" >&5
- echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
- 
- case $cf_cv_need_xopen_extension in
-@@ -17484,7 +17485,7 @@
- 	;;
- esac
- 
--echo "$as_me:17487: checking for term.h" >&5
-+echo "$as_me:17488: checking for term.h" >&5
- echo $ECHO_N "checking for term.h... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17505,7 +17506,7 @@
- for cf_header in $cf_header_list
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17508 "configure"
-+#line 17509 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -17519,16 +17520,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17522: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17523: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17525: \$? = $ac_status" >&5
-+  echo "$as_me:17526: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17528: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17529: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17531: \$? = $ac_status" >&5
-+  echo "$as_me:17532: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_term_header=$cf_header
- 	 break
-@@ -17547,7 +17548,7 @@
- 	for cf_header in ncurses/term.h ncursesw/term.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 17550 "configure"
-+#line 17551 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -17565,16 +17566,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17568: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17569: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17571: \$? = $ac_status" >&5
-+  echo "$as_me:17572: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17574: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17575: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17577: \$? = $ac_status" >&5
-+  echo "$as_me:17578: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_term_header=$cf_header
- 			 break
-@@ -17589,7 +17590,7 @@
- esac
- 
- fi
--echo "$as_me:17592: result: $cf_cv_term_header" >&5
-+echo "$as_me:17593: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- case $cf_cv_term_header in
-@@ -17616,7 +17617,7 @@
- 	;;
- esac
- 
--echo "$as_me:17619: checking for unctrl.h" >&5
-+echo "$as_me:17620: checking for unctrl.h" >&5
- echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
- if test "${cf_cv_unctrl_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17637,7 +17638,7 @@
- for cf_header in $cf_header_list
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17640 "configure"
-+#line 17641 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -17651,16 +17652,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17654: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17655: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17657: \$? = $ac_status" >&5
-+  echo "$as_me:17658: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17660: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17661: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17663: \$? = $ac_status" >&5
-+  echo "$as_me:17664: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unctrl_header=$cf_header
- 	 break
-@@ -17673,12 +17674,12 @@
- done
- 
- fi
--echo "$as_me:17676: result: $cf_cv_unctrl_header" >&5
-+echo "$as_me:17677: result: $cf_cv_unctrl_header" >&5
- echo "${ECHO_T}$cf_cv_unctrl_header" >&6
- 
- case $cf_cv_unctrl_header in
- (no)
--	{ echo "$as_me:17681: WARNING: unctrl.h header not found" >&5
-+	{ echo "$as_me:17682: WARNING: unctrl.h header not found" >&5
- echo "$as_me: WARNING: unctrl.h header not found" >&2;}
- 	;;
- esac
-@@ -17767,10 +17768,10 @@
- 
- cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--	echo "$as_me:17770: checking for ${cf_func}" >&5
-+	echo "$as_me:17771: checking for ${cf_func}" >&5
- echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
- 
--echo "${as_me:-configure}:17773: testing ${cf_func} ..." 1>&5
-+echo "${as_me:-configure}:17774: testing ${cf_func} ..." 1>&5
- 
- 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17779,7 +17780,7 @@
- 		eval cf_result='$ac_cv_func_'$cf_func
- 		if test ".$cf_result" != ".no"; then
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 17782 "configure"
-+#line 17783 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -17812,16 +17813,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17815: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17816: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17818: \$? = $ac_status" >&5
-+  echo "$as_me:17819: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17821: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17822: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17824: \$? = $ac_status" >&5
-+  echo "$as_me:17825: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -17837,7 +17838,7 @@
- 
- 	# use the computed/retrieved cache-value:
- 	eval 'cf_result=$cf_cv_func_'$cf_func
--	echo "$as_me:17840: result: $cf_result" >&5
-+	echo "$as_me:17841: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result != no; then
- 		cat >>confdefs.h <&5
-+	echo "$as_me:17856: checking for ${cf_func}" >&5
- echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
- 
--echo "${as_me:-configure}:17858: testing ${cf_func} ..." 1>&5
-+echo "${as_me:-configure}:17859: testing ${cf_func} ..." 1>&5
- 
- 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17864,7 +17865,7 @@
- 		eval cf_result='$ac_cv_func_'$cf_func
- 		if test ".$cf_result" != ".no"; then
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 17867 "configure"
-+#line 17868 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -17897,16 +17898,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17900: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17901: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17903: \$? = $ac_status" >&5
-+  echo "$as_me:17904: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17906: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17907: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17909: \$? = $ac_status" >&5
-+  echo "$as_me:17910: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -17922,7 +17923,7 @@
- 
- 	# use the computed/retrieved cache-value:
- 	eval 'cf_result=$cf_cv_func_'$cf_func
--	echo "$as_me:17925: result: $cf_result" >&5
-+	echo "$as_me:17926: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result != no; then
- 		cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
--#line 17949 "configure"
-+#line 17950 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -17966,21 +17967,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17969: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17970: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17972: \$? = $ac_status" >&5
-+  echo "$as_me:17973: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17975: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17976: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17978: \$? = $ac_status" >&5
-+  echo "$as_me:17979: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
- 
--echo "${as_me:-configure}:17983: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
-+echo "${as_me:-configure}:17984: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
- 
- 		cat >>confdefs.h <&5
-+echo "$as_me:18004: checking for ncurses extended functions" >&5
- echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
- if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18010 "configure"
-+#line 18011 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -18022,16 +18023,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18025: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18026: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18028: \$? = $ac_status" >&5
-+  echo "$as_me:18029: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18031: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18032: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18034: \$? = $ac_status" >&5
-+  echo "$as_me:18035: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_ext_funcs=defined
- else
-@@ -18039,7 +18040,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18042 "configure"
-+#line 18043 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -18064,16 +18065,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18067: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18068: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18070: \$? = $ac_status" >&5
-+  echo "$as_me:18071: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18073: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18074: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18076: \$? = $ac_status" >&5
-+  echo "$as_me:18077: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_ext_funcs=yes
- else
-@@ -18087,7 +18088,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:18090: result: $cf_cv_ncurses_ext_funcs" >&5
-+echo "$as_me:18091: result: $cf_cv_ncurses_ext_funcs" >&5
- echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
- test "$cf_cv_ncurses_ext_funcs" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -18101,11 +18102,11 @@
- 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
- 	then
- 		cf_define_xpg5=no
--		echo "$as_me:18104: checking if _XPG5 should be defined to enable wide-characters" >&5
-+		echo "$as_me:18105: checking if _XPG5 should be defined to enable wide-characters" >&5
- echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 18108 "configure"
-+#line 18109 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -18118,16 +18119,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18121: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18122: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18124: \$? = $ac_status" >&5
-+  echo "$as_me:18125: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18127: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18128: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18130: \$? = $ac_status" >&5
-+  echo "$as_me:18131: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18136,7 +18137,7 @@
- cf_save_cppflags="$CPPFLAGS"
- 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
- 			 cat >conftest.$ac_ext <<_ACEOF
--#line 18139 "configure"
-+#line 18140 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -18149,16 +18150,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18152: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18153: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18155: \$? = $ac_status" >&5
-+  echo "$as_me:18156: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18158: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18159: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18161: \$? = $ac_status" >&5
-+  echo "$as_me:18162: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_define_xpg5=yes
- else
-@@ -18169,7 +18170,7 @@
- 			 CPPFLAGS="$cf_save_cppflags"
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--		echo "$as_me:18172: result: $cf_define_xpg5" >&5
-+		echo "$as_me:18173: result: $cf_define_xpg5" >&5
- echo "${ECHO_T}$cf_define_xpg5" >&6
- 
- 		if test "$cf_define_xpg5" = yes
-@@ -18178,14 +18179,14 @@
- 		fi
- 	fi
- 
--	echo "$as_me:18181: checking for wide-character functions" >&5
-+	echo "$as_me:18182: checking for wide-character functions" >&5
- echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
- if test "${cf_cv_widechar_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18188 "configure"
-+#line 18189 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -18202,16 +18203,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18205: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18206: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18208: \$? = $ac_status" >&5
-+  echo "$as_me:18209: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18211: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18212: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18214: \$? = $ac_status" >&5
-+  echo "$as_me:18215: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_widechar_funcs=yes
- else
-@@ -18222,7 +18223,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:18225: result: $cf_cv_widechar_funcs" >&5
-+echo "$as_me:18226: result: $cf_cv_widechar_funcs" >&5
- echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
- 	if test "$cf_cv_widechar_funcs" != no ; then
- 
-@@ -18243,14 +18244,14 @@
- 
- fi
- 
--echo "$as_me:18246: checking if $cf_cv_screen library uses pthreads" >&5
-+echo "$as_me:18247: checking if $cf_cv_screen library uses pthreads" >&5
- echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
- if test "${cf_cv_use_pthreads+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18253 "configure"
-+#line 18254 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -18268,16 +18269,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18271: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18272: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18274: \$? = $ac_status" >&5
-+  echo "$as_me:18275: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18277: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18278: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18280: \$? = $ac_status" >&5
-+  echo "$as_me:18281: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_use_pthreads=yes
- else
-@@ -18288,21 +18289,21 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:18291: result: $cf_cv_use_pthreads" >&5
-+echo "$as_me:18292: result: $cf_cv_use_pthreads" >&5
- echo "${ECHO_T}$cf_cv_use_pthreads" >&6
- test $cf_cv_use_pthreads = yes &&
- cat >>confdefs.h <<\EOF
- #define USE_PTHREADS 1
- EOF
- 
--echo "$as_me:18298: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:18299: 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 18305 "configure"
-+#line 18306 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18322,16 +18323,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18325: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18326: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18328: \$? = $ac_status" >&5
-+  echo "$as_me:18329: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18331: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18332: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18334: \$? = $ac_status" >&5
-+  echo "$as_me:18335: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -18343,7 +18344,7 @@
- 
- fi
- 
--echo "$as_me:18346: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:18347: 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
-@@ -18352,7 +18353,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18355: checking for openpty in -lutil" >&5
-+echo "$as_me:18356: 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
-@@ -18360,7 +18361,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18363 "configure"
-+#line 18364 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18379,16 +18380,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18382: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18383: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18385: \$? = $ac_status" >&5
-+  echo "$as_me:18386: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18388: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18389: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18391: \$? = $ac_status" >&5
-+  echo "$as_me:18392: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18399,7 +18400,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18402: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18403: 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
-@@ -18407,7 +18408,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18410: checking for openpty header" >&5
-+echo "$as_me:18411: 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
-@@ -18434,7 +18435,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18437 "configure"
-+#line 18438 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18451,16 +18452,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18454: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18455: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18457: \$? = $ac_status" >&5
-+  echo "$as_me:18458: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18460: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18461: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18463: \$? = $ac_status" >&5
-+  echo "$as_me:18464: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18478,7 +18479,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18481: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18482: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18512,7 +18513,7 @@
- 	fi
- fi
- 
--echo "$as_me:18515: checking for function curses_version" >&5
-+echo "$as_me:18516: checking for function curses_version" >&5
- echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
- if test "${cf_cv_func_curses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18522,7 +18523,7 @@
-   cf_cv_func_curses_version=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18525 "configure"
-+#line 18526 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -18535,15 +18536,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18538: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18539: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18541: \$? = $ac_status" >&5
-+  echo "$as_me:18542: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18543: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18544: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18546: \$? = $ac_status" >&5
-+  echo "$as_me:18547: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_curses_version=yes
- 
-@@ -18558,14 +18559,14 @@
- fi
- rm -f core
- fi
--echo "$as_me:18561: result: $cf_cv_func_curses_version" >&5
-+echo "$as_me:18562: result: $cf_cv_func_curses_version" >&5
- echo "${ECHO_T}$cf_cv_func_curses_version" >&6
- test "$cf_cv_func_curses_version" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_CURSES_VERSION 1
- EOF
- 
--echo "$as_me:18568: checking for alternate character set array" >&5
-+echo "$as_me:18569: checking for alternate character set array" >&5
- echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
- if test "${cf_cv_curses_acs_map+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18575,7 +18576,7 @@
- for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 18578 "configure"
-+#line 18579 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -18591,16 +18592,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18594: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18595: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18597: \$? = $ac_status" >&5
-+  echo "$as_me:18598: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18601: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18603: \$? = $ac_status" >&5
-+  echo "$as_me:18604: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_acs_map=$name; break
- else
-@@ -18611,7 +18612,7 @@
- done
- 
- fi
--echo "$as_me:18614: result: $cf_cv_curses_acs_map" >&5
-+echo "$as_me:18615: result: $cf_cv_curses_acs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
- 
- test "$cf_cv_curses_acs_map" != unknown &&
-@@ -18621,7 +18622,7 @@
- 
- if test "$cf_enable_widec" = yes; then
- 
--echo "$as_me:18624: checking for wide alternate character set array" >&5
-+echo "$as_me:18625: checking for wide alternate character set array" >&5
- echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
- if test "${cf_cv_curses_wacs_map+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18631,7 +18632,7 @@
- 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18634 "configure"
-+#line 18635 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -18647,16 +18648,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18650: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18651: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18653: \$? = $ac_status" >&5
-+  echo "$as_me:18654: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18656: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18657: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18659: \$? = $ac_status" >&5
-+  echo "$as_me:18660: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_map=$name
- 	 break
-@@ -18667,7 +18668,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	done
- fi
--echo "$as_me:18670: result: $cf_cv_curses_wacs_map" >&5
-+echo "$as_me:18671: result: $cf_cv_curses_wacs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
- 
- test "$cf_cv_curses_wacs_map" != unknown &&
-@@ -18675,7 +18676,7 @@
- #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
- EOF
- 
--echo "$as_me:18678: checking for wide alternate character constants" >&5
-+echo "$as_me:18679: checking for wide alternate character constants" >&5
- echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
- if test "${cf_cv_curses_wacs_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18685,7 +18686,7 @@
- if test "$cf_cv_curses_wacs_map" != unknown
- then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18688 "configure"
-+#line 18689 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -18702,16 +18703,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18706: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18708: \$? = $ac_status" >&5
-+  echo "$as_me:18709: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18712: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18714: \$? = $ac_status" >&5
-+  echo "$as_me:18715: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -18721,7 +18722,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- else
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18724 "configure"
-+#line 18725 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -18737,16 +18738,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18740: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18741: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18743: \$? = $ac_status" >&5
-+  echo "$as_me:18744: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18746: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18747: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18749: \$? = $ac_status" >&5
-+  echo "$as_me:18750: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -18757,7 +18758,7 @@
- fi
- 
- fi
--echo "$as_me:18760: result: $cf_cv_curses_wacs_symbols" >&5
-+echo "$as_me:18761: result: $cf_cv_curses_wacs_symbols" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
- 
- test "$cf_cv_curses_wacs_symbols" != no &&
-@@ -18767,10 +18768,10 @@
- 
- fi
- 
--echo "$as_me:18770: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:18771: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 18773 "configure"
-+#line 18774 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -18788,16 +18789,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18791: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18792: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18794: \$? = $ac_status" >&5
-+  echo "$as_me:18795: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18797: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18798: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18800: \$? = $ac_status" >&5
-+  echo "$as_me:18801: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -18806,7 +18807,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:18809: result: $cf_result" >&5
-+echo "$as_me:18810: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -18827,14 +18828,14 @@
- if test "$cf_enable_widec" = yes; then
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:18830: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:18831: 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 18837 "configure"
-+#line 18838 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18852,23 +18853,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18855: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18856: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18858: \$? = $ac_status" >&5
-+  echo "$as_me:18859: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18861: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18862: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18864: \$? = $ac_status" >&5
-+  echo "$as_me:18865: \$? = $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 18871 "configure"
-+#line 18872 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18887,16 +18888,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18890: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18891: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18893: \$? = $ac_status" >&5
-+  echo "$as_me:18894: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18896: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18897: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18899: \$? = $ac_status" >&5
-+  echo "$as_me:18900: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -18908,7 +18909,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18911: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:18912: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -18931,14 +18932,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:18934: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:18935: 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 18941 "configure"
-+#line 18942 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18956,23 +18957,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18959: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18960: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18962: \$? = $ac_status" >&5
-+  echo "$as_me:18963: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18965: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18966: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18968: \$? = $ac_status" >&5
-+  echo "$as_me:18969: \$? = $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 18975 "configure"
-+#line 18976 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -18991,16 +18992,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18994: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18995: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18997: \$? = $ac_status" >&5
-+  echo "$as_me:18998: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19001: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19003: \$? = $ac_status" >&5
-+  echo "$as_me:19004: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -19012,7 +19013,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:19015: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:19016: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -19035,14 +19036,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:19038: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:19039: 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 19045 "configure"
-+#line 19046 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19060,23 +19061,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19063: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19064: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19066: \$? = $ac_status" >&5
-+  echo "$as_me:19067: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19069: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19070: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19072: \$? = $ac_status" >&5
-+  echo "$as_me:19073: \$? = $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 19079 "configure"
-+#line 19080 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19095,16 +19096,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19098: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19099: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19101: \$? = $ac_status" >&5
-+  echo "$as_me:19102: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19104: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19105: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19107: \$? = $ac_status" >&5
-+  echo "$as_me:19108: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -19116,7 +19117,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:19119: result: $cf_cv_wint_t" >&5
-+echo "$as_me:19120: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -19140,10 +19141,10 @@
- 
- 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
- 
--echo "$as_me:19143: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:19144: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 19146 "configure"
-+#line 19147 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -19161,16 +19162,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19164: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19165: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19167: \$? = $ac_status" >&5
-+  echo "$as_me:19168: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19170: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19171: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19173: \$? = $ac_status" >&5
-+  echo "$as_me:19174: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -19179,7 +19180,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:19182: result: $cf_result" >&5
-+echo "$as_me:19183: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -19201,10 +19202,10 @@
- 
- 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
- 
--echo "$as_me:19204: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:19205: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 19207 "configure"
-+#line 19208 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -19222,16 +19223,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19225: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19226: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19228: \$? = $ac_status" >&5
-+  echo "$as_me:19229: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19231: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19232: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19234: \$? = $ac_status" >&5
-+  echo "$as_me:19235: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -19240,7 +19241,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:19243: result: $cf_result" >&5
-+echo "$as_me:19244: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -19262,10 +19263,10 @@
- 
- 	if test "$NCURSES_OK_WINT_T" = 0 ; then
- 
--echo "$as_me:19265: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:19266: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 19268 "configure"
-+#line 19269 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -19283,16 +19284,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19286: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19287: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19289: \$? = $ac_status" >&5
-+  echo "$as_me:19290: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19292: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19293: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19295: \$? = $ac_status" >&5
-+  echo "$as_me:19296: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -19301,7 +19302,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:19304: result: $cf_result" >&5
-+echo "$as_me:19305: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -19330,11 +19331,11 @@
- boolfnames \
- ttytype
- do
--echo "$as_me:19333: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:19334: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19337 "configure"
-+#line 19338 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -19362,16 +19363,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19365: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19366: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19368: \$? = $ac_status" >&5
-+  echo "$as_me:19369: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19371: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19372: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19374: \$? = $ac_status" >&5
-+  echo "$as_me:19375: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- 
-@@ -19381,7 +19382,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:19384: result: $cf_result" >&5
-+echo "$as_me:19385: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -19393,14 +19394,14 @@
- EOF
- 
- else
--	echo "$as_me:19396: checking for data $cf_data in library" >&5
-+	echo "$as_me:19397: checking for data $cf_data in library" >&5
- echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19403 "configure"
-+#line 19404 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -19433,16 +19434,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19436: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19437: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19439: \$? = $ac_status" >&5
-+  echo "$as_me:19440: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19442: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19443: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19445: \$? = $ac_status" >&5
-+  echo "$as_me:19446: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -19454,7 +19455,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19457 "configure"
-+#line 19458 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -19480,15 +19481,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:19483: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19484: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19486: \$? = $ac_status" >&5
-+  echo "$as_me:19487: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:19488: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19489: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19491: \$? = $ac_status" >&5
-+  echo "$as_me:19492: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- 
-@@ -19500,7 +19501,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:19503: result: $cf_result" >&5
-+	echo "$as_me:19504: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -19517,7 +19518,7 @@
- 
- if ( test "$GCC" = yes || test "$GXX" = yes )
- then
--echo "$as_me:19520: checking if you want to turn on gcc warnings" >&5
-+echo "$as_me:19521: checking if you want to turn on gcc warnings" >&5
- echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -19534,7 +19535,7 @@
- 	with_warnings=no
- 
- fi;
--echo "$as_me:19537: result: $with_warnings" >&5
-+echo "$as_me:19538: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- if test "$with_warnings" = "yes"
- then
-@@ -19557,10 +19558,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:19560: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:19561: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <&5
-+		if { (eval echo "$as_me:19613: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19615: \$? = $ac_status" >&5
-+  echo "$as_me:19616: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:19617: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:19618: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -19692,7 +19693,7 @@
- done
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19695 "configure"
-+#line 19696 "configure"
- #include "confdefs.h"
- 
- #include 
-@@ -19707,26 +19708,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19710: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19711: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19713: \$? = $ac_status" >&5
-+  echo "$as_me:19714: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19716: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19717: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19719: \$? = $ac_status" >&5
-+  echo "$as_me:19720: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--echo "$as_me:19722: checking for X11/Xt const-feature" >&5
-+echo "$as_me:19723: checking for X11/Xt const-feature" >&5
- echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
- if test "${cf_cv_const_x_string+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19729 "configure"
-+#line 19730 "configure"
- #include "confdefs.h"
- 
- #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
-@@ -19743,16 +19744,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19746: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19747: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19749: \$? = $ac_status" >&5
-+  echo "$as_me:19750: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19752: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19755: \$? = $ac_status" >&5
-+  echo "$as_me:19756: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_const_x_string=no
-@@ -19767,7 +19768,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:19770: result: $cf_cv_const_x_string" >&5
-+echo "$as_me:19771: result: $cf_cv_const_x_string" >&5
- echo "${ECHO_T}$cf_cv_const_x_string" >&6
- 
- LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
-@@ -19796,7 +19797,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
-  fi
- cat > conftest.$ac_ext <&5
-+	{ echo "$as_me:19816: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -19828,12 +19829,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:19831: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:19832: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19834: \$? = $ac_status" >&5
-+  echo "$as_me:19835: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:19836: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:19837: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -19841,7 +19842,7 @@
- 	CFLAGS="$cf_save_CFLAGS"
- elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
- then
--	{ echo "$as_me:19844: checking for $CC warning options..." >&5
-+	{ echo "$as_me:19845: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -19865,12 +19866,12 @@
- 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:19868: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:19869: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19871: \$? = $ac_status" >&5
-+  echo "$as_me:19872: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:19873: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:19874: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Winline)
-@@ -19878,7 +19879,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:19881: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:19882: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -19888,7 +19889,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:19891: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:19892: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -19904,7 +19905,7 @@
- fi
- fi
- 
--echo "$as_me:19907: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:19908: 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.
-@@ -19921,7 +19922,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:19924: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:19925: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -20035,23 +20036,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:20038: checking for dmalloc.h" >&5
-+	echo "$as_me:20039: 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 20044 "configure"
-+#line 20045 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:20048: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20049: \"$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:20054: \$? = $ac_status" >&5
-+  echo "$as_me:20055: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -20070,11 +20071,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:20073: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:20074: 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:20077: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:20078: 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
-@@ -20082,7 +20083,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20085 "configure"
-+#line 20086 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -20101,16 +20102,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20104: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20105: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20107: \$? = $ac_status" >&5
-+  echo "$as_me:20108: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20110: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20111: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20113: \$? = $ac_status" >&5
-+  echo "$as_me:20114: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -20121,7 +20122,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:20124: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:20125: 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 <&5
-+echo "$as_me:20140: 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.
-@@ -20153,7 +20154,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:20156: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:20157: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -20267,23 +20268,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:20270: checking for dbmalloc.h" >&5
-+	echo "$as_me:20271: 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 20276 "configure"
-+#line 20277 "configure"
- #include "confdefs.h"
- #include 
- _ACEOF
--if { (eval echo "$as_me:20280: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20281: \"$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:20286: \$? = $ac_status" >&5
-+  echo "$as_me:20287: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -20302,11 +20303,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:20305: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:20306: 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:20309: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:20310: 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
-@@ -20314,7 +20315,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20317 "configure"
-+#line 20318 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -20333,16 +20334,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20336: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20337: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20339: \$? = $ac_status" >&5
-+  echo "$as_me:20340: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20342: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20343: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20345: \$? = $ac_status" >&5
-+  echo "$as_me:20346: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -20353,7 +20354,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:20356: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:20357: 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 <&5
-+echo "$as_me:20372: 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.
-@@ -20385,7 +20386,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:20388: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:20389: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -20498,7 +20499,7 @@
- 	;;
- esac
- 
--echo "$as_me:20501: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:20502: 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.
-@@ -20508,7 +20509,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:20511: result: $with_no_leaks" >&5
-+echo "$as_me:20512: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -20526,7 +20527,7 @@
- LD_RPATH_OPT=
- if test "x$cf_cv_enable_rpath" != xno
- then
--	echo "$as_me:20529: checking for an rpath option" >&5
-+	echo "$as_me:20530: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- 	case $cf_cv_system_name in
- 	(irix*)
-@@ -20557,12 +20558,12 @@
- 	(*)
- 		;;
- 	esac
--	echo "$as_me:20560: result: $LD_RPATH_OPT" >&5
-+	echo "$as_me:20561: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- 	case "x$LD_RPATH_OPT" in
- 	(x-R*)
--		echo "$as_me:20565: checking if we need a space after rpath option" >&5
-+		echo "$as_me:20566: 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"
- 
-@@ -20583,7 +20584,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 20586 "configure"
-+#line 20587 "configure"
- #include "confdefs.h"
- 
- int
-@@ -20595,16 +20596,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20598: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20599: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20601: \$? = $ac_status" >&5
-+  echo "$as_me:20602: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20604: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20605: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20607: \$? = $ac_status" >&5
-+  echo "$as_me:20608: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -20614,14 +20615,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		LIBS="$cf_save_LIBS"
--		echo "$as_me:20617: result: $cf_rpath_space" >&5
-+		echo "$as_me:20618: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 		;;
- 	esac
- fi
- 
--echo "$as_me:20624: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:20625: checking if rpath-hack should be disabled" >&5
- echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-@@ -20638,21 +20639,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:20641: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:20642: result: $cf_disable_rpath_hack" >&5
- echo "${ECHO_T}$cf_disable_rpath_hack" >&6
- if test "$cf_disable_rpath_hack" = no ; then
- 
--echo "$as_me:20645: checking for updated LDFLAGS" >&5
-+echo "$as_me:20646: checking for updated LDFLAGS" >&5
- echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
- if test -n "$LD_RPATH_OPT" ; then
--	echo "$as_me:20648: result: maybe" >&5
-+	echo "$as_me:20649: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- 
- 	for ac_prog in ldd
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:20655: checking for $ac_word" >&5
-+echo "$as_me:20656: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20667,7 +20668,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_cf_ldd_prog="$ac_prog"
--echo "$as_me:20670: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20671: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20675,10 +20676,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:20678: result: $cf_ldd_prog" >&5
-+  echo "$as_me:20679: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:20681: result: no" >&5
-+  echo "$as_me:20682: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20692,7 +20693,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 20695 "configure"
-+#line 20696 "configure"
- #include "confdefs.h"
- #include 
- int
-@@ -20704,16 +20705,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:20707: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20708: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20710: \$? = $ac_status" >&5
-+  echo "$as_me:20711: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20714: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20716: \$? = $ac_status" >&5
-+  echo "$as_me:20717: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
- 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
-@@ -20741,7 +20742,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:20744: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:20745: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -20753,11 +20754,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:20756: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:20757: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:20760: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:20761: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -20794,7 +20795,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:20797: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:20798: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -20807,11 +20808,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:20810: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:20811: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:20814: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:20815: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -20848,7 +20849,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:20851: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:20852: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -20861,14 +20862,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:20864: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:20865: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:20868: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:20869: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:20871: result: no" >&5
-+	echo "$as_me:20872: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20958,7 +20959,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:20961: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:20962: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -21134,7 +21135,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:21137: error: ambiguous option: $1
-+    { { echo "$as_me:21138: 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;}
-@@ -21153,7 +21154,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:21156: error: unrecognized option: $1
-+  -*) { { echo "$as_me:21157: 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;}
-@@ -21203,7 +21204,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
--  *) { { echo "$as_me:21206: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:21207: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -21499,7 +21500,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:21502: creating $ac_file" >&5
-+    { echo "$as_me:21503: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -21517,7 +21518,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:21520: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:21521: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -21530,7 +21531,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:21533: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:21534: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -21546,7 +21547,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:21549: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:21550: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -21555,7 +21556,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:21558: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:21559: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -21592,7 +21593,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:21595: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:21596: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -21603,7 +21604,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:21606: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:21607: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -21652,7 +21653,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:21655: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:21656: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -21663,7 +21664,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:21666: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:21667: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -21676,7 +21677,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:21679: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:21680: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -21734,7 +21735,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:21737: $ac_file is unchanged" >&5
-+      { echo "$as_me:21738: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: test/tclock.c
-Prereq:  1.40 
---- ncurses-6.1-20200111+/test/tclock.c	2019-12-14 23:25:29.000000000 +0000
-+++ ncurses-6.1-20200118/test/tclock.c	2020-01-18 16:46:35.000000000 +0000
-@@ -1,4 +1,4 @@
--/* $Id: tclock.c,v 1.40 2019/12/14 23:25:29 tom Exp $ */
-+/* $Id: tclock.c,v 1.41 2020/01/18 16:46:35 tom Exp $ */
- 
- #define NEED_TIME_H
- #include 
-@@ -48,7 +48,7 @@
-     MvAddCh(y, x, (chtype) col);
- }
- 
--/* Draw a diagonal(arbitrary) line using Bresenham's alogrithm. */
-+/* Draw a diagonal(arbitrary) line using Bresenham's algorithm. */
- static void
- dline(int pair, int from_x, int from_y, int x2, int y2, int ch)
- {
diff --git a/ncurses-6.2-20200215.patch b/ncurses-6.2-20200215.patch
new file mode 100644
index 0000000..ef44aa0
--- /dev/null
+++ b/ncurses-6.2-20200215.patch
@@ -0,0 +1,1149 @@
+# ncurses 6.2 - patch 20200215 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.2 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.2 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.2
+#	http://invisible-mirror.net/archives/ncurses/6.2 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200215.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Feb 16 02:14:29 UTC 2020
+# ------------------------------------------------------------------------------
+# INSTALL                               |   39 ++++
+# NEWS                                  |   10 +
+# VERSION                               |    2 
+# dist.mk                               |    4 
+# doc/html/man/adacurses6-config.1.html |    2 
+# doc/html/man/captoinfo.1m.html        |    2 
+# doc/html/man/clear.1.html             |    2 
+# doc/html/man/form.3x.html             |    2 
+# doc/html/man/infocmp.1m.html          |    2 
+# doc/html/man/infotocap.1m.html        |    2 
+# doc/html/man/menu.3x.html             |    2 
+# doc/html/man/ncurses.3x.html          |    2 
+# doc/html/man/ncurses6-config.1.html   |    2 
+# doc/html/man/panel.3x.html            |  272 +++++++++++++++++++++-----------
+# doc/html/man/tabs.1.html              |    2 
+# doc/html/man/terminfo.5.html          |    2 
+# doc/html/man/tic.1m.html              |    2 
+# doc/html/man/toe.1m.html              |    2 
+# doc/html/man/tput.1.html              |    2 
+# doc/html/man/tset.1.html              |    2 
+# man/manhtml.aliases                   |    5 
+# man/panel.3x                          |  237 +++++++++++++++++----------
+# misc/run_tic.in                       |    4 
+# ncurses/base/MKlib_gen.sh             |    4 
+# package/debian-mingw/changelog        |    4 
+# package/debian-mingw64/changelog      |    4 
+# package/debian/changelog              |    4 
+# package/mingw-ncurses.nsi             |    4 
+# package/mingw-ncurses.spec            |    2 
+# package/ncurses.spec                  |    2 
+# package/ncursest.spec                 |    2 
+# 31 files changed, 419 insertions(+), 210 deletions(-)
+# ------------------------------------------------------------------------------
+Index: INSTALL
+Prereq:  1.216 
+--- ncurses-6.2-20200212+/INSTALL	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200215/INSTALL	2020-02-15 13:39:30.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: INSTALL,v 1.216 2020/02/02 23:34:34 tom Exp $
++-- $Id: INSTALL,v 1.217 2020/02/15 13:39:30 tom Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -1343,6 +1343,43 @@
+     you may encounter when building a system with different versions of
+     ncurses:
+ 
++    6.2 (Feb 12, 2020)
++	Interface changes:
++
++	+ the terminal database must be compiled with ncurses 6.2 tic;
++	  older versions of tic/infocmp will not work.  Aside from that,
++	  the compiled database will work with older applications.
++
++	+ "*.pc" and "ncurses*-config" files give the same information.
++
++	+ vwprintw and vwscanw are deprecated.
++
++	Added extensions:
++
++	+ These make it simpler to substitute a debug-configuration of the
++	  library for non-debug:
++		curses_trace
++		exit_curses
++		exit_terminfo
++
++	Added internal functions (other than "_sp" variants):
++
++	+ These provide fast-lookup of common user-defined capabilities:
++		_nc_find_user_entry
++		_nc_get_userdefs_table
++		_nc_get_hash_user
++
++	+ This is added to work around compiler-warnings:
++		_nc_fmt_funcptr
++
++	Removed internal functions:
++
++	+ _nc_import_termtype
++
++	Modified internal functions:
++
++	+ _nc_reserve_pairs no longer returns a value
++
+     6.1 (Jan 27, 2018)
+ 	Interface changes:
+ 
+Index: NEWS
+Prereq:  1.3446 
+--- ncurses-6.2-20200212+/NEWS	2020-02-12 02:21:21.000000000 +0000
++++ ncurses-6.2-20200215/NEWS	2020-02-15 18:56:00.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3446 2020/02/12 02:21:21 tom Exp $
++-- $Id: NEWS,v 1.3450 2020/02/15 18:56:00 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,14 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20200215
++	+ improve manual page for panel library, extending the portability
++	  section as well as documenting error-returns.
++	+ show tic's version when installing terminal database in run_tic.sh
++	+ correct check for gcc vs other compilers used in ncurses 6.0, from
++	  FreeBSD patch by Kyle Evans (cf: 20150725).
++	+ add notes for 6.2 to INSTALL.
++
+ 20200212 6.2 release for upload to ftp.gnu.org
+ 	+ update release notes
+ 	+ minor build-fixes, mostly to test-package scripts
+Index: VERSION
+--- ncurses-6.2-20200212+/VERSION	2020-02-09 23:35:50.000000000 +0000
++++ ncurses-6.2-20200215/VERSION	2020-02-15 09:30:48.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.2	20200212
++5:0:10	6.2	20200215
+Index: dist.mk
+Prereq:  1.1334 
+--- ncurses-6.2-20200212+/dist.mk	2020-02-09 21:49:08.000000000 +0000
++++ ncurses-6.2-20200215/dist.mk	2020-02-15 09:30:48.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1334 2020/02/09 21:49:08 tom Exp $
++# $Id: dist.mk,v 1.1335 2020/02/15 09:30:48 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 2
+-NCURSES_PATCH = 20200212
++NCURSES_PATCH = 20200215
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.2-20200212+/doc/html/man/adacurses6-config.1.html	2020-02-09 21:19:26.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/adacurses6-config.1.html	2020-02-15 21:04:10.000000000 +0000
+@@ -126,7 +126,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.2-20200212+/doc/html/man/captoinfo.1m.html	2020-02-09 21:19:26.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/captoinfo.1m.html	2020-02-15 21:04:10.000000000 +0000
+@@ -199,7 +199,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.2-20200212+/doc/html/man/clear.1.html	2020-02-09 21:19:26.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/clear.1.html	2020-02-15 21:04:10.000000000 +0000
+@@ -149,7 +149,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.2-20200212+/doc/html/man/form.3x.html	2020-02-09 21:19:29.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/form.3x.html	2020-02-15 21:04:13.000000000 +0000
+@@ -247,7 +247,7 @@
+        curses(3x)  and  related  pages  whose names begin "form_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.2-20200212+/doc/html/man/infocmp.1m.html	2020-02-09 21:19:30.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/infocmp.1m.html	2020-02-15 21:04:14.000000000 +0000
+@@ -513,7 +513,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.2-20200212+/doc/html/man/infotocap.1m.html	2020-02-09 21:19:30.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/infotocap.1m.html	2020-02-15 21:04:14.000000000 +0000
+@@ -91,7 +91,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.2-20200212+/doc/html/man/menu.3x.html	2020-02-09 21:19:30.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/menu.3x.html	2020-02-15 21:04:14.000000000 +0000
+@@ -222,7 +222,7 @@
+        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.2-20200212+/doc/html/man/ncurses.3x.html	2020-02-09 21:19:31.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/ncurses.3x.html	2020-02-15 21:04:15.000000000 +0000
+@@ -60,7 +60,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.2-20200212+/doc/html/man/ncurses6-config.1.html	2020-02-09 21:19:31.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/ncurses6-config.1.html	2020-02-15 21:04:15.000000000 +0000
+@@ -113,7 +113,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.2-20200212+/doc/html/man/panel.3x.html	2020-02-09 21:19:31.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/panel.3x.html	2020-02-15 21:18:25.000000000 +0000
+@@ -27,7 +27,24 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: panel.3x,v 1.28 2020/02/02 23:34:34 tom Exp @
++  * @Id: panel.3x,v 1.39 2020/02/15 21:06:40 tom Exp @
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
++  * ---------
+ -->
+ 
+ 
+@@ -55,21 +72,30 @@
+ 
+        cc [flags] sourcefiles -lpanel -lncurses
+ 
+-       PANEL *new_panel(WINDOW *win);
+-       int bottom_panel(PANEL *pan);
+-       int top_panel(PANEL *pan);
+-       int show_panel(PANEL *pan);
++       PANEL *new_panel(WINDOW *win);
++
++       int bottom_panel(PANEL *pan);
++       int top_panel(PANEL *pan);
++       int show_panel(PANEL *pan);
+        void update_panels(void);
+-       int hide_panel(PANEL *pan);
+-       WINDOW *panel_window(const PANEL *pan);
+-       int replace_panel(PANEL *pan, WINDOW *window);
+-       int move_panel(PANEL *pan, int starty, int startx);
+-       int panel_hidden(const PANEL *pan);
+-       PANEL *panel_above(const PANEL *pan);
+-       PANEL *panel_below(const PANEL *pan);
+-       int set_panel_userptr(PANEL *pan, const void *ptr);
+-       const void *panel_userptr(const PANEL *pan);
+-       int del_panel(PANEL *pan);
++       int hide_panel(PANEL *pan);
++
++       WINDOW *panel_window(const PANEL *pan);
++       int replace_panel(PANEL *pan, WINDOW *window);
++       int move_panel(PANEL *pan, int starty, int startx);
++       int panel_hidden(const PANEL *pan);
++
++       PANEL *panel_above(const PANEL *pan);
++       PANEL *panel_below(const PANEL *pan);
++
++       int set_panel_userptr(PANEL *pan, const void *ptr);
++       const void *panel_userptr(const PANEL *pan);
++
++       int del_panel(PANEL *pan);
++
++       /* ncurses-extensions */
++       PANEL *ground_panel(SCREEN *sp);
++       PANEL *ceiling_panel(SCREEN *sp);
+ 
+ 
+

    DESCRIPTION

    +@@ -89,73 +115,100 @@
+ 
+ 
+

    FUNCTIONS

    +-       new_panel(win)
+-              allocates   a   PANEL  structure, associates it with win, places
+-              the panel on the top of the stack  (causes  it to  be  displayed
+-              above any other panel) and returns a pointer to the new panel.
+-
+-       update_panels
+-              refreshes  the  virtual  screen to reflect the relations between
+-              the panels in the stack, but does not call doupdate  to  refresh
+-              the  physical  screen.   Use  this  function and not wrefresh or
+-              wnoutrefresh.  update_panels may be called more than once before
+-              a call to doupdate, but doupdate is the function responsible for
+-              updating the physical screen.
+-
+-       del_panel(pan)
+-              removes the given panel from  the   stack  and  deallocates  the
+-              PANEL structure (but not its associated window).
+-
+-       hide_panel(pan)
+-              removes  the  given panel from the panel stack and thus hides it
+-              from view.  The PANEL structure is not lost, merely removed from
+-              the stack.
+-
+-       panel_hidden(pan)
+-              returns  TRUE if the panel is in the panel stack, FALSE if it is
+-              not.  If the panel is a null pointer, return ERR.
+-
+-       show_panel(pan)
+-              makes a hidden panel visible by placing it on top of the  panels
+-              in the panel stack.  See COMPATIBILITY below.
+-
+-       top_panel(pan)
+-              puts  the given visible panel on top of all panels in the stack.
+-              See COMPATIBILITY below.
+-
+-       bottom_panel(pan)
+-              puts panel at the bottom of all panels.
+-
+-       move_panel(pan,starty,startx)
+-              moves the given panel window so that its upper-left corner is at
+-              starty, startx.  It does not change the position of the panel in
+-              the stack.  Be sure to use this function, not mvwin, to  move  a
+-              panel window.
+-
+-       replace_panel(pan,window)
+-              replaces  the  current  window of panel with window (useful, for
+-              example if you want to resize a panel; if you're using  ncurses,
+-              you  can  call  replace_panel on the output of wresize(3x)).  It
+-              does not change the position of the panel in the stack.
+-
+-       panel_above(pan)
+-              returns a pointer to the panel above pan.  If the panel argument
+-              is  (PANEL  *)0, it returns a pointer to the bottom panel in the
+-              stack.
+-
+-       panel_below(pan)
+-              returns a pointer to the panel just below  pan.   If  the  panel
+-              argument is (PANEL *)0, it returns a pointer to the top panel in
+-              the stack.
+ 
+-       set_panel_userptr(pan,ptr)
+-              sets the panel's user pointer.
++

    bottom_panel

    ++       bottom_panel(pan) puts panel pan at the bottom of all panels.
++
++
++

    ceiling_panel

    ++       ceiling_panel(sp) acts like panel_below(NULL), for the given SCREEN sp.
++
++
++

    del_panel

    ++       del_panel(pan)  removes the given panel pan from the  stack and deallo-
++       cates the PANEL structure (but not its associated window).
++
++
++

    ground_panel

    ++       ground_panel(sp) acts like panel_above(NULL), for the given SCREEN sp.
++
++
++

    hide_panel

    ++       hide_panel(pan) removes the given panel pan from the  panel  stack  and
++       thus  hides  it  from  view.   The  PANEL structure is not lost, merely
++       removed from the stack.
++
++
++

    move_panel

    ++       move_panel(pan,starty,startx) moves the given  panel  pan's  window  so
++       that  its  upper-left  corner is at starty, startx.  It does not change
++       the position of the panel in the stack.  Be sure to use this  function,
++       not mvwin(3x), to move a panel window.
++
++
++

    new_panel

    ++       new_panel(win)  allocates   a  PANEL structure, associates it with win,
++       places the panel on the top of the stack (causes  it to  be   displayed
++       above any other panel) and returns a pointer to the new panel.
++
++
++

    panel_above

    ++       panel_above(pan)  returns  a  pointer  to  the panel above pan.  If the
++       panel argument is (PANEL *)0, it returns a pointer to the bottom  panel
++       in the stack.
++
++
++

    panel_below

    ++       panel_below(pan) returns a pointer to the panel just below pan.  If the
++       panel argument is (PANEL *)0, it returns a pointer to the top panel  in
++       the stack.
++
++
++

    panel_hidden

    ++       panel_hidden(pan)  returns TRUE if the panel pan is in the panel stack,
++       FALSE if it is not.  If the panel is a null pointer, return ERR.
+ 
+-       panel_userptr(pan)
+-              returns the user pointer for a given panel.
+ 
+-       panel_window(pan)
+-              returns a pointer to the window of the given panel.
++

    panel_userptr

    ++       panel_userptr(pan) returns the user pointer for a given panel pan.
++
++
++

    panel_window

    ++       panel_window(pan) returns a pointer to the window of  the  given  panel
++       pan.
++
++
++

    replace_panel

    ++       replace_panel(pan,window) replaces the current window of panel pan with
++       window This is useful, for example if you want to resize a  panel.   In
++       ncurses,  you  can  call replace_panel to resize a panel using a window
++       resized with wresize(3x).  It does not change the position of the panel
++       in the stack.
++
++
++

    set_panel_userptr

    ++       set_panel_userptr(pan,ptr) sets the panel's user pointer.
++
++
++

    show_panel

    ++       show_panel(pan)  makes  a  hidden panel visible by placing it on top of
++       the panels in the panel stack.  See COMPATIBILITY below.
++
++
++

    top_panel

    ++       top_panel(pan) puts the given visible panel pan on top of all panels in
++       the stack.  See COMPATIBILITY below.
++
++
++

    update_panels

    ++       update_panels()  refreshes  the virtual screen to reflect the relations
++       between the panels in the stack, but  does  not  call  doupdate(3x)  to
++       refresh the physical screen.  Use this function and not wrefresh(3x) or
++       wnoutrefresh(3x).
++
++       update_panels may be called more than once before a call  to  doupdate,
++       but  doupdate  is  the  function  responsible for updating the physical
++       screen.
+ 
+ 
+

    DIAGNOSTICS

    +@@ -163,6 +216,12 @@
+        Each  routine  that returns an int value returns OK if it executes suc-
+        cessfully and ERR if not.
+ 
++       Except as noted, the pan and window parameters must  be  non-null.   If
++       those are null, an error is returned.
++
++       The  move_panel  function  uses  mvwin(3x), and will return an error if
++       mvwin returns an error.
++
+ 
+

    COMPATIBILITY

    +        Reasonable care has been taken  to   ensure   compatibility  with   the
+@@ -192,8 +251,25 @@
+ 
+        It is not part of X/Open Curses.
+ 
+-       Aside  from  ncurses,  only  systems  based  on SVr4 source code, e.g.,
+-       Solaris provide this library.
++       A few implementations exist:
++
++       o   Systems  based  on  SVr4  source  code, e.g., Solaris, provide this
++           library.
++
++       o   ncurses (since version 0.6 in 1993) and PDCurses (since version 2.2
++           in 1995) provide a panel library whose common ancestor was a public
++           domain implementation by Warren Tucker published  in  u386mon  2.20
++           (1990).
++
++           According  to  Tucker, the SystemV panel library was first released
++           in SVr3.2 (1988), and his implementation  helped  with  a  port  to
++           SVr3.1 (1987).
++
++           Several  developers have improved each of these; they are no longer
++           the same as Tucker's implementation.
++
++       o   NetBSD 8 (2018) has a panel library  begun  by  Valery  Ushakov  in
++           2015.  This is based on the AT&T documentation.
+ 
+ 
+

    FILES

    +@@ -205,13 +281,17 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+

    AUTHOR

    +-       Originally written by Warren Tucker <wht@n4hgf.mt-park.ga.us>,  primar-
+-       ily  to  assist  in  porting u386mon to systems without a native panels
+-       library.  Repackaged for ncurses by Zeyd ben-Halim.
++       Originally  written by Warren Tucker <wht@n4hgf.mt-park.ga.us>, primar-
++       ily to assist in porting u386mon to systems  without  a  native  panels
++       library.
++
++       Repackaged for ncurses by Zeyd ben-Halim.
++
++       Juergen Pfeifer and Thomas E. Dickey revised/improved the library.
+ 
+ 
+ 
+@@ -222,7 +302,27 @@
+ 
  • NAME
    • 
+ 
  • SYNOPSIS
    • 
+ 
  • DESCRIPTION
    • 
+-
  • FUNCTIONS
    • 
++
  • FUNCTIONS
++
++
    • 
+ 
  • DIAGNOSTICS
    • 
+ 
  • COMPATIBILITY
    • 
+ 
  • NOTE
    • 
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.2-20200212+/doc/html/man/tabs.1.html	2020-02-09 21:19:31.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/tabs.1.html	2020-02-15 21:04:15.000000000 +0000
+@@ -206,7 +206,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.2-20200212+/doc/html/man/terminfo.5.html	2020-02-09 21:19:32.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/terminfo.5.html	2020-02-15 21:04:16.000000000 +0000
+@@ -105,7 +105,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This manual describes ncurses version 6.2 (patch 20200212).
++       This manual describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+

    Terminfo Entry Syntax

    +Index: doc/html/man/tic.1m.html
+--- ncurses-6.2-20200212+/doc/html/man/tic.1m.html	2020-02-09 21:19:32.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/tic.1m.html	2020-02-15 21:04:16.000000000 +0000
+@@ -461,7 +461,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.2-20200212+/doc/html/man/toe.1m.html	2020-02-09 21:19:32.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/toe.1m.html	2020-02-15 21:04:16.000000000 +0000
+@@ -171,7 +171,7 @@
+        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
+        minfo(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.2-20200212+/doc/html/man/tput.1.html	2020-02-09 21:19:32.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/tput.1.html	2020-02-15 21:04:16.000000000 +0000
+@@ -523,7 +523,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.2-20200212+/doc/html/man/tset.1.html	2020-02-09 21:19:32.000000000 +0000
++++ ncurses-6.2-20200215/doc/html/man/tset.1.html	2020-02-15 21:04:16.000000000 +0000
+@@ -390,7 +390,7 @@
+        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.2 (patch 20200212).
++       This describes ncurses version 6.2 (patch 20200215).
+ 
+ 
+ 
+Index: man/manhtml.aliases
+Prereq:  1.14 
+--- ncurses-6.2-20200212+/man/manhtml.aliases	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200215/man/manhtml.aliases	2020-02-15 21:02:48.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manhtml.aliases,v 1.14 2020/02/02 23:34:34 tom Exp $
++# $Id: manhtml.aliases,v 1.16 2020/02/15 21:02:48 tom Exp $
+ #***************************************************************************
+ # Copyright 2019,2020 Thomas E. Dickey                                     *
+ # Copyright 2013,2017 Free Software Foundation, Inc.                       *
+@@ -45,6 +45,7 @@
+ longname(3X)		curs_termattrs(3X)
+ meta(3X)		curs_inopts(3X)
+ mvcur(3X)		curs_terminfo(3X)
++mvwin(3X)		curs_window(3X)
+ newterm(3X)		curs_initscr(3X)
+ refresh(3X)		curs_refresh(3X)
+ reset_shell_mode(3X)	curs_kernel(3X)
+@@ -61,3 +62,5 @@
+ use_extended_names(3X)	curs_extend(3X)
+ vidputs(3X)		curs_terminfo(3X)
+ wgetch(3X)		curs_getch(3X)
++wnoutrefresh(3X)	curs_refresh(3X)
++wrefresh(3X)		curs_refresh(3X)
+Index: man/panel.3x
+Prereq:  1.28 
+--- ncurses-6.2-20200212+/man/panel.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200215/man/panel.3x	2020-02-15 21:06:40.000000000 +0000
+@@ -27,12 +27,16 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: panel.3x,v 1.28 2020/02/02 23:34:34 tom Exp $
++.\" $Id: panel.3x,v 1.39 2020/02/15 21:06:40 tom Exp $
+ .TH panel 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
++.de bP
++.ie n  .IP \(bu 4
++.el    .IP \(bu 2
++..
+ .SH NAME
+ panel \- panel stack extension for curses
+ .SH SYNOPSIS
+@@ -40,35 +44,41 @@
+ .P
+ \fBcc [flags] sourcefiles \-lpanel \-lncurses\fR
+ .P
+-\fBPANEL *new_panel(WINDOW *win);\fR
++\fBPANEL *new_panel(WINDOW *\fIwin\fB);\fR
++.sp
++\fBint bottom_panel(PANEL *\fIpan\fB);\fR
+ .br
+-\fBint bottom_panel(PANEL *pan);\fR
++\fBint top_panel(PANEL *\fIpan\fB);\fR
+ .br
+-\fBint top_panel(PANEL *pan);\fR
+-.br
+-\fBint show_panel(PANEL *pan);\fR
++\fBint show_panel(PANEL *\fIpan\fB);\fR
+ .br
+ \fBvoid update_panels(void);\fR
+ .br
+-\fBint hide_panel(PANEL *pan);\fR
+-.br
+-\fBWINDOW *panel_window(const PANEL *pan);\fR
++\fBint hide_panel(PANEL *\fIpan\fB);\fR
++.sp
++\fBWINDOW *panel_window(const PANEL *\fIpan\fB);\fR
+ .br
+-\fBint replace_panel(PANEL *pan, WINDOW *window);\fR
++\fBint replace_panel(PANEL *\fIpan\fB, WINDOW *\fIwindow\fB);\fR
+ .br
+-\fBint move_panel(PANEL *pan, int starty, int startx);\fR
++\fBint move_panel(PANEL *\fIpan\fB, int \fIstarty\fB, int \fIstartx\fB);\fR
+ .br
+-\fBint panel_hidden(const PANEL *pan);\fR
++\fBint panel_hidden(const PANEL *\fIpan\fB);\fR
++.sp
++\fBPANEL *panel_above(const PANEL *\fIpan\fB);\fR
+ .br
+-\fBPANEL *panel_above(const PANEL *pan);\fR
++\fBPANEL *panel_below(const PANEL *\fIpan\fB);\fR
++.sp
++\fBint set_panel_userptr(PANEL *\fIpan\fB, const void *\fIptr\fB);\fR
+ .br
+-\fBPANEL *panel_below(const PANEL *pan);\fR
++\fBconst void *panel_userptr(const PANEL *\fIpan\fB);\fR
++.sp
++\fBint del_panel(PANEL *\fIpan\fB);\fR
++.sp
++/* ncurses-extensions */
+ .br
+-\fBint set_panel_userptr(PANEL *pan, const void *ptr);\fR
++\fBPANEL *ground_panel(SCREEN *\fIsp\fB);\fR
+ .br
+-\fBconst void *panel_userptr(const PANEL *pan);\fR
+-.br
+-\fBint del_panel(PANEL *pan);\fR
++\fBPANEL *ceiling_panel(SCREEN *\fIsp\fB);\fR
+ .br
+ .SH DESCRIPTION
+ Panels are \fBcurses\fR(3X) windows with the added feature of
+@@ -89,87 +99,113 @@
+ Panel routines are a functional layer added to \fBcurses\fR(3X), make only
+ high-level curses calls, and work anywhere terminfo curses does.
+ .SH FUNCTIONS
+-.TP
+-.B new_panel(win)
+-allocates  a  \fBPANEL\fR structure, associates it with
+-\fBwin\fR, places the panel on the top of the stack  (causes  it
+-to  be  displayed above any other panel) and returns a
+-pointer to the new panel.
+-.TP
+-.B update_panels
+-refreshes the \fIvirtual screen\fP to reflect the relations between the
+-panels in the stack, but does not call \fBdoupdate\fP to refresh the
+-\fIphysical screen\fP.
+-Use this function and not \fBwrefresh\fP or \fBwnoutrefresh\fP.
+-.B update_panels
+-may be called more than once before a call to
+-\fBdoupdate\fP, but \fBdoupdate\fP is the function responsible for updating
+-the \fIphysical screen\fP.
+-.TP
+-.B del_panel(pan)
+-removes the given panel from the  stack and deallocates the
++.\" ---------
++.SS bottom_panel
++\fBbottom_panel(\fIpan\fB)\fR
++puts panel \fIpan\fP at the bottom of all panels.
++.\" ---------
++.SS ceiling_panel
++\fBceiling_panel(\fIsp\fB)\fR
++acts like \fBpanel_below(NULL)\fP, for the given \fBSCREEN\fP \fIsp\fP.
++.\" ---------
++.SS del_panel
++\fBdel_panel(\fIpan\fB)\fR
++removes the given panel \fIpan\fP from the  stack and deallocates the
+ \fBPANEL\fR structure (but not its associated window).
+-.TP
+-.B hide_panel(pan)
+-removes the given panel from the panel stack and thus hides it from
+-view.
++.\" ---------
++.SS ground_panel
++\fBground_panel(\fIsp\fB)\fR
++acts like \fBpanel_above(NULL)\fP, for the given \fBSCREEN\fP \fIsp\fP.
++.\" ---------
++.SS hide_panel
++\fBhide_panel(\fIpan\fB)\fR
++removes the given panel \fIpan\fP from the panel stack
++and thus hides it from view.
+ The \fBPANEL\fR structure is not lost, merely removed from the stack.
+-.TP
+-.B panel_hidden(pan)
+-returns \fBTRUE\fP if the panel is in the panel stack,
+-\fBFALSE\fP if it is not.
+-If the panel is a null pointer, return \fBERR\fP.
+-.TP
+-.B show_panel(pan)
+-makes a hidden panel visible by placing it on top of the panels in the
+-panel stack.
+-See COMPATIBILITY below.
+-.TP
+-.B top_panel(pan)
+-puts the given visible panel on top of all panels in the stack.
+-See
+-COMPATIBILITY below.
+-.TP
+-.B bottom_panel(pan)
+-puts panel at the bottom of all panels.
+-.TP
+-.B move_panel(pan,starty,startx)
+-moves the given panel window so that its upper-left corner is at
+-\fBstarty\fR, \fBstartx\fR.
+-It does not change the position of the
+-panel in the stack.
+-Be sure to use this function, not \fBmvwin\fR,
+-to move a panel window.
+-.TP
+-.B replace_panel(pan,window)
+-replaces the current window of panel with \fBwindow\fR (useful, for
+-example if you want to resize a panel; if you're using \fBncurses\fR,
+-you can call \fBreplace_panel\fR on the output of \fBwresize\fR(3X)).
++.\" ---------
++.SS move_panel
++\fBmove_panel(\fIpan\fB,\fIstarty\fB,\fIstartx\fB)\fR
++moves the given panel \fIpan\fP's window so that its upper-left corner is at
++\fIstarty\fR, \fIstartx\fR.
+ It does not change the position of the panel in the stack.
+-.TP
+-.B panel_above(pan)
+-returns a pointer to the panel above pan.
++Be sure to use this function, not \fBmvwin\fR(3X), to move a panel window.
++.\" ---------
++.SS new_panel
++\fBnew_panel(\fIwin\fB)\fR allocates  a  \fBPANEL\fR structure,
++associates it with \fIwin\fR, places the panel on the top of the stack
++(causes  it to  be  displayed above any other panel) and returns a
++pointer to the new panel.
++.\" ---------
++.SS panel_above
++\fBpanel_above(\fIpan\fB)\fR
++returns a pointer to the panel above \fIpan\fP.
+ If the panel argument is
+ \fB(PANEL *)0\fR, it returns a pointer to the bottom panel in the stack.
+-.TP
+-.B panel_below(pan)
+-returns a pointer to the panel just below pan.
++.\" ---------
++.SS panel_below
++\fBpanel_below(\fIpan\fB)\fR
++returns a pointer to the panel just below \fIpan\fP.
+ If the panel argument
+ is \fB(PANEL *)0\fR, it returns a pointer to the top panel in the stack.
+-.TP
+-.B set_panel_userptr(pan,ptr)
++.\" ---------
++.SS panel_hidden
++\fBpanel_hidden(\fIpan\fB)\fR
++returns \fBTRUE\fP if the panel \fIpan\fP is in the panel stack,
++\fBFALSE\fP if it is not.
++If the panel is a null pointer, return \fBERR\fP.
++.\" ---------
++.SS panel_userptr
++\fBpanel_userptr(\fIpan\fB)\fR
++returns the user pointer for a given panel \fIpan\fP.
++.\" ---------
++.SS panel_window
++\fBpanel_window(\fIpan\fB)\fR
++returns a pointer to the window of the given panel \fIpan\fP.
++.\" ---------
++.SS replace_panel
++\fBreplace_panel(\fIpan\fB,\fIwindow\fB)\fR
++replaces the current window of panel \fIpan\fP with \fIwindow\fR
++This is useful, for example if you want to resize a panel.
++In \fBncurses\fR, you can call \fBreplace_panel\fR
++to resize a panel using a window resized with \fBwresize\fR(3X).
++It does not change the position of the panel in the stack.
++.\" ---------
++.SS set_panel_userptr
++\fBset_panel_userptr(\fIpan\fB,\fIptr\fB)\fR
+ sets the panel's user pointer.
+-.TP
+-.B panel_userptr(pan)
+-returns the user pointer for a given panel.
+-.TP
+-.B panel_window(pan)
+-returns a pointer to the window of the given panel.
++.\" ---------
++.SS show_panel
++\fBshow_panel(\fIpan\fB)\fR
++makes a hidden panel visible by placing it on top of the panels in the
++panel stack.
++See \fBCOMPATIBILITY\fP below.
++.\" ---------
++.SS top_panel
++\fBtop_panel(\fIpan\fB)\fR
++puts the given visible panel \fIpan\fP on top of all panels in the stack.
++See \fBCOMPATIBILITY\fP below.
++.\" ---------
++.SS update_panels
++\fBupdate_panels()\fR
++refreshes the \fIvirtual screen\fP to reflect the relations between the
++panels in the stack, but does not call \fBdoupdate\fP(3X) to refresh the
++\fIphysical screen\fP.
++Use this function and not \fBwrefresh\fP(3X) or \fBwnoutrefresh\fP(3X).
++.PP
++\fBupdate_panels\fP may be called more than once before a call to
++\fBdoupdate\fP, but \fBdoupdate\fP is the function responsible for updating
++the \fIphysical screen\fP.
+ .SH DIAGNOSTICS
+ Each routine that returns a pointer returns \fBNULL\fR if an error
+ occurs.
+ Each routine that returns an int value returns \fBOK\fR if it
+ executes successfully and \fBERR\fR if not.
++.PP
++Except as noted, the \fIpan\fP and \fIwindow\fP parameters must be non-null.
++If those are null, an error is returned.
++.PP
++The \fBmove_panel\fP function uses \fBmvwin\fP(3X),
++and will return an error if \fBmvwin\fP returns an error.
+ .SH COMPATIBILITY
+ Reasonable care has been taken to  ensure  compatibility
+ with  the  native  panel facility introduced in System V (inspection of
+@@ -198,8 +234,27 @@
+ .PP
+ It is not part of X/Open Curses.
+ .PP
+-Aside from ncurses, only systems based on SVr4 source code,
+-e.g., Solaris provide this library.
++A few implementations exist:
++.bP
++Systems based on SVr4 source code,
++e.g., Solaris, provide this library.
++.bP
++\fBncurses\fP (since version 0.6 in 1993)
++and \fBPDCurses\fP (since version 2.2 in 1995)
++provide a panel library whose common ancestor
++was a public domain implementation by Warren Tucker
++published in \fIu386mon\fP 2.20 (1990).
++.IP
++According to Tucker, the SystemV panel library
++was first released in SVr3.2 (1988),
++and his implementation helped with a port to SVr3.1 (1987).
++.IP
++Several developers have improved each of these;
++they are no longer the same as Tucker's implementation.
++.bP
++NetBSD 8 (2018)
++has a panel library begun by Valery Ushakov in 2015.
++This is based on the AT&T documentation.
+ .SH FILES
+ .P
+ panel.h
+@@ -214,7 +269,11 @@
+ This describes \fBncurses\fR
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+ .SH AUTHOR
++.PP
+ Originally written by Warren Tucker ,
+-primarily to assist in porting u386mon to systems without a native
++primarily to assist in porting \fIu386mon\fP to systems without a native
+ panels library.
++.PP
+ Repackaged for ncurses by Zeyd ben-Halim.
++.PP
++Juergen Pfeifer and Thomas E. Dickey revised/improved the library.
+Index: misc/run_tic.in
+Prereq:  1.37 
+--- ncurses-6.2-20200212+/misc/run_tic.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200215/misc/run_tic.in	2020-02-15 15:30:53.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!@SHELL@
+-# $Id: run_tic.in,v 1.37 2020/02/02 23:34:34 tom Exp $
++# $Id: run_tic.in,v 1.38 2020/02/15 15:30:53 tom Exp $
+ ##############################################################################
+ # Copyright 2019,2020 Thomas E. Dickey                                       #
+ # Copyright 2000-2012,2017 Free Software Foundation, Inc.                    #
+@@ -145,6 +145,7 @@
+ 	document, and install the terminfo without the -x option.
+ 
+ EOF
++$TIC_PATH -V
+ if ( $TIC_PATH -x -s -o "$TERMINFO" $source )
+ then
+ 	echo "** built new $TERMINFO"
+@@ -164,6 +165,7 @@
+ 	document, and install the terminfo without the -x option.
+ 
+ EOF
++$TIC_PATH -V
+ if ( $TIC_PATH -s -o "$TERMINFO" $source )
+ then
+ 	echo "** built new $TERMINFO"
+Index: ncurses/base/MKlib_gen.sh
+Prereq:  1.63 
+--- ncurses-6.2-20200212+/ncurses/base/MKlib_gen.sh	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200215/ncurses/base/MKlib_gen.sh	2020-02-15 14:58:02.000000000 +0000
+@@ -2,7 +2,7 @@
+ #
+ # MKlib_gen.sh -- generate sources from curses.h macro definitions
+ #
+-# ($Id: MKlib_gen.sh,v 1.63 2020/02/02 23:34:34 tom Exp $)
++# ($Id: MKlib_gen.sh,v 1.64 2020/02/15 14:58:02 tom Exp $)
+ #
+ ##############################################################################
+ # Copyright 2018,2020 Thomas E. Dickey                                       #
+@@ -74,7 +74,7 @@
+ # determine if we are using gcc, and if so, what version because the proposed
+ # solution uses a nonstandard option.
+ PRG=`echo "$1" | $AWK '{ sub(/^[ 	]*/,""); sub(/[ 	].*$/, ""); print; }' || exit 0`
+-FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1`
++FSF=`("$PRG" --version 2>/dev/null || exit 0) | fgrep "Free Software Foundation" | head -n 1`
+ ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0`
+ ONE=`echo "$ALL" | sed -e 's/\..*$//'`
+ if test -n "$FSF" && test -n "$ALL" && test -n "$ONE" ; then
+Index: package/debian-mingw/changelog
+--- ncurses-6.2-20200212+/package/debian-mingw/changelog	2020-02-09 23:35:50.000000000 +0000
++++ ncurses-6.2-20200215/package/debian-mingw/changelog	2020-02-15 09:30:48.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200212) unstable; urgency=low
++ncurses6 (6.2+20200215) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 09 Feb 2020 18:35:50 -0500
++ -- Thomas E. Dickey   Sat, 15 Feb 2020 04:30:48 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.2-20200212+/package/debian-mingw64/changelog	2020-02-09 23:35:50.000000000 +0000
++++ ncurses-6.2-20200215/package/debian-mingw64/changelog	2020-02-15 09:30:48.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200212) unstable; urgency=low
++ncurses6 (6.2+20200215) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 09 Feb 2020 18:35:50 -0500
++ -- Thomas E. Dickey   Sat, 15 Feb 2020 04:30:48 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.2-20200212+/package/debian/changelog	2020-02-09 23:35:50.000000000 +0000
++++ ncurses-6.2-20200215/package/debian/changelog	2020-02-15 09:30:48.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200212) unstable; urgency=low
++ncurses6 (6.2+20200215) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 09 Feb 2020 18:35:50 -0500
++ -- Thomas E. Dickey   Sat, 15 Feb 2020 04:30:48 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.377 
+--- ncurses-6.2-20200212+/package/mingw-ncurses.nsi	2020-02-09 23:35:50.000000000 +0000
++++ ncurses-6.2-20200215/package/mingw-ncurses.nsi	2020-02-15 09:30:48.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.377 2020/02/09 23:35:50 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.378 2020/02/15 09:30:48 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "2"
+ !define VERSION_YYYY  "2020"
+-!define VERSION_MMDD  "0212"
++!define VERSION_MMDD  "0215"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.2-20200212+/package/mingw-ncurses.spec	2020-02-09 23:35:50.000000000 +0000
++++ ncurses-6.2-20200215/package/mingw-ncurses.spec	2020-02-15 09:30:48.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.2
+-Release: 20200212
++Release: 20200215
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.2-20200212+/package/ncurses.spec	2020-02-12 01:47:16.000000000 +0000
++++ ncurses-6.2-20200215/package/ncurses.spec	2020-02-15 09:30:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.2
+-Release: 20200212
++Release: 20200215
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.2-20200212+/package/ncursest.spec	2020-02-12 01:53:30.000000000 +0000
++++ ncurses-6.2-20200215/package/ncursest.spec	2020-02-15 09:30:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.2
+-Release: 20200212
++Release: 20200215
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.2-20200222.patch b/ncurses-6.2-20200222.patch
new file mode 100644
index 0000000..8d5ecdc
--- /dev/null
+++ b/ncurses-6.2-20200222.patch
@@ -0,0 +1,1202 @@
+# ncurses 6.2 - patch 20200222 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.2 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.2 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.2
+#	http://invisible-mirror.net/archives/ncurses/6.2 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200222.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Feb 23 02:26:40 UTC 2020
+# ------------------------------------------------------------------------------
+# Ada95/gen/gen.c                       |   15 ++-
+# NEWS                                  |   12 ++
+# VERSION                               |    2 
+# c++/Makefile.in                       |   40 +++++----
+# dist.mk                               |    4 
+# doc/html/man/adacurses6-config.1.html |    2 
+# doc/html/man/captoinfo.1m.html        |    2 
+# doc/html/man/clear.1.html             |    2 
+# doc/html/man/form.3x.html             |    2 
+# doc/html/man/infocmp.1m.html          |    2 
+# doc/html/man/infotocap.1m.html        |    2 
+# doc/html/man/menu.3x.html             |    2 
+# doc/html/man/ncurses.3x.html          |  131 ++++++++++++++++++++++++++------
+# doc/html/man/ncurses6-config.1.html   |    2 
+# doc/html/man/panel.3x.html            |    2 
+# doc/html/man/tabs.1.html              |    2 
+# doc/html/man/terminfo.5.html          |    2 
+# doc/html/man/tic.1m.html              |    2 
+# doc/html/man/toe.1m.html              |    2 
+# doc/html/man/tput.1.html              |    2 
+# doc/html/man/tset.1.html              |    2 
+# form/Makefile.in                      |   27 +++++-
+# include/Makefile.in                   |   19 ++++
+# man/ncurses.3x                        |   85 ++++++++++++++++++++
+# menu/Makefile.in                      |   23 ++++-
+# misc/terminfo.src                     |   81 ++++++++++++++-----
+# ncurses/Makefile.in                   |   19 ++--
+# package/debian-mingw/changelog        |    4 
+# package/debian-mingw64/changelog      |    4 
+# package/debian/changelog              |    4 
+# package/mingw-ncurses.nsi             |    4 
+# package/mingw-ncurses.spec            |    2 
+# package/ncurses.spec                  |    2 
+# package/ncursest.spec                 |    2 
+# panel/Makefile.in                     |   20 ++++
+# test/Makefile.in                      |   12 ++
+# 36 files changed, 424 insertions(+), 118 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/gen/gen.c
+Prereq:  1.71 
+--- ncurses-6.2-20200215+/Ada95/gen/gen.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200222/Ada95/gen/gen.c	2020-02-22 21:01:00.000000000 +0000
+@@ -33,7 +33,7 @@
+ 
+ /*
+     Version Control
+-    $Id: gen.c,v 1.71 2020/02/02 23:34:34 tom Exp $
++    $Id: gen.c,v 1.72 2020/02/22 21:01:00 tom Exp $
+   --------------------------------------------------------------------------*/
+ /*
+   This program prints on its standard output the source for the
+@@ -180,8 +180,17 @@
+   if (argc != 2)
+     my_error("Only one argument expected (DFT_ARG_SUFFIX)");
+ 
+-  printf("--  Generated by the C program %s (source " __FILE__ ").\n",
+-	 my_program_invocation_name);
++  if ((strlen(argv[0]) + strlen(__FILE__)) > 25)
++    {
++      printf("--  Generated by the C program %.40s.\n",
++	     my_program_invocation_name);
++    }
++  else
++    {
++      printf("--  Generated by the C program %s (source %s).\n",
++	     my_program_invocation_name,
++	     __FILE__);
++    }
+   printf("--  Do not edit this file directly.\n");
+   printf("--  The values provided here may vary on your system.\n");
+   printf("\n");
+Index: NEWS
+Prereq:  1.3450 
+--- ncurses-6.2-20200215+/NEWS	2020-02-15 18:56:00.000000000 +0000
++++ ncurses-6.2-20200222/NEWS	2020-02-23 01:08:47.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3450 2020/02/15 18:56:00 tom Exp $
++-- $Id: NEWS,v 1.3453 2020/02/23 01:08:47 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,16 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20200222
++	+ expanded note in ncurses.3x regarding automatically-included headers
++	+ improve vt50h and vt52 based on DECScope manual -TD
++	+ add/use vt52+keypad and vt52-basic -TD
++	+ check/workaround for line-too-long in Ada95 generate utility when
++	  building out-of-tree.
++	+ improve/update HEADER_DEPS in */Makefile.in
++	+ add "check" rule to include/Makefile, to demonstrate that the headers
++	  include all of the required headers for the types used.
++
+ 20200215
+ 	+ improve manual page for panel library, extending the portability
+ 	  section as well as documenting error-returns.
+Index: VERSION
+--- ncurses-6.2-20200215+/VERSION	2020-02-15 09:30:48.000000000 +0000
++++ ncurses-6.2-20200222/VERSION	2020-02-22 13:49:45.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.2	20200215
++5:0:10	6.2	20200222
+Index: c++/Makefile.in
+Prereq:  1.119 
+--- ncurses-6.2-20200215+/c++/Makefile.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200222/c++/Makefile.in	2020-02-22 17:29:13.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.119 2020/02/02 23:34:34 tom Exp $
++# $Id: Makefile.in,v 1.121 2020/02/22 17:29:13 tom Exp $
+ ##############################################################################
+ # Copyright 2018,2020 Thomas E. Dickey                                       #
+ # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
+@@ -186,29 +186,35 @@
+ 
+ ###############################################################################
+ 
+-internal_h	= $(srcdir)/internal.h \
+-		  $(INCDIR)/ncurses_cfg.h \
+-		  $(INCDIR)/nc_mingw.h \
+-		  $(INCDIR)/nc_string.h
+-
+-etip_h		= etip.h \
+-		  $(INCDIR)/ncurses_dll.h
++HEADER_DEPS	= \
++	etip.h \
++	../include/curses.h \
++	../include/eti.h \
++	../include/form.h \
++	../include/menu.h \
++	../include/ncurses_cfg.h \
++	../include/ncurses_def.h \
++	../include/ncurses_dll.h \
++	../include/panel.h \
++	../include/unctrl.h \
++	$(INCDIR)/nc_mingw.h \
++	$(INCDIR)/nc_string.h \
++	$(srcdir)/cursesp.h \
++	$(srcdir)/cursesw.h \
++	$(srcdir)/cursslk.h \
++	$(srcdir)/internal.h
+ 
+ cursesw_h	= $(srcdir)/cursesw.h \
+-		  $(etip_h) \
+-		  $(INCDIR)/curses.h
++		  $(HEADER_DEPS)
+ 
+ cursesp_h	= $(srcdir)/cursesp.h \
+-		  $(cursesw_h) \
+-		  $(INCDIR)/panel.h
++		  $(cursesw_h)
+ 
+ cursesf_h	= $(srcdir)/cursesf.h \
+-		  $(cursesp_h) \
+-		  $(INCDIR)/form.h
++		  $(cursesp_h)
+ 
+ cursesm_h	= $(srcdir)/cursesm.h \
+-		  $(cursesp_h) \
+-		  $(INCDIR)/menu.h
++		  $(cursesp_h)
+ 
+ cursslk_h	= $(srcdir)/cursslk.h \
+ 		  $(cursesw_h)
+@@ -230,7 +236,7 @@
+ OBJS_DEMO = $(MODEL)/demo$o
+ 
+ $(MODEL)/demo$o : $(srcdir)/demo.cc \
+-		$(internal_h) \
++		$(HEADER_DEPS) \
+ 		$(cursesf_h) \
+ 		$(cursesm_h) \
+ 		$(cursesapp_h)
+Index: dist.mk
+Prereq:  1.1335 
+--- ncurses-6.2-20200215+/dist.mk	2020-02-15 09:30:48.000000000 +0000
++++ ncurses-6.2-20200222/dist.mk	2020-02-22 13:49:45.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1335 2020/02/15 09:30:48 tom Exp $
++# $Id: dist.mk,v 1.1336 2020/02/22 13:49:45 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 2
+-NCURSES_PATCH = 20200215
++NCURSES_PATCH = 20200222
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.2-20200215+/doc/html/man/adacurses6-config.1.html	2020-02-15 21:04:10.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/adacurses6-config.1.html	2020-02-23 01:14:14.000000000 +0000
+@@ -126,7 +126,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.2-20200215+/doc/html/man/captoinfo.1m.html	2020-02-15 21:04:10.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/captoinfo.1m.html	2020-02-23 01:14:14.000000000 +0000
+@@ -199,7 +199,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.2-20200215+/doc/html/man/clear.1.html	2020-02-15 21:04:10.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/clear.1.html	2020-02-23 01:14:14.000000000 +0000
+@@ -149,7 +149,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.2-20200215+/doc/html/man/form.3x.html	2020-02-15 21:04:13.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/form.3x.html	2020-02-23 01:14:18.000000000 +0000
+@@ -247,7 +247,7 @@
+        curses(3x)  and  related  pages  whose names begin "form_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.2-20200215+/doc/html/man/infocmp.1m.html	2020-02-15 21:04:14.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/infocmp.1m.html	2020-02-23 01:14:19.000000000 +0000
+@@ -513,7 +513,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.2-20200215+/doc/html/man/infotocap.1m.html	2020-02-15 21:04:14.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/infotocap.1m.html	2020-02-23 01:14:19.000000000 +0000
+@@ -91,7 +91,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.2-20200215+/doc/html/man/menu.3x.html	2020-02-15 21:04:14.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/menu.3x.html	2020-02-23 01:14:19.000000000 +0000
+@@ -222,7 +222,7 @@
+        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.2-20200215+/doc/html/man/ncurses.3x.html	2020-02-15 21:04:15.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/ncurses.3x.html	2020-02-23 01:14:21.000000000 +0000
+@@ -28,7 +28,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.144 2020/02/02 23:34:34 tom Exp @
++  * @Id: ncurses.3x,v 1.145 2020/02/23 01:05:45 tom Exp @
+ -->
+ 
+ 
+@@ -60,7 +60,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+@@ -1277,28 +1277,37 @@
+        between  the XSI Curses and ncurses calls) are described in PORTABILITY
+        sections of the library man pages.
+ 
++
++

    Error checking

    ++       In many cases, X/Open Curses is vague about error conditions,  omitting
++       some of the SVr4 documentation.
++
+        Unlike other implementations, this one checks parameters such as point-
+-       ers  to WINDOW structures to ensure they are not null.  The main reason
+-       for providing this behavior is to guard against programmer error.   The
+-       standard  interface  does  not provide a way for the library to tell an
++       ers to WINDOW structures to ensure they are not null.  The main  reason
++       for  providing this behavior is to guard against programmer error.  The
++       standard interface does not provide a way for the library  to  tell  an
+        application which of several possible errors were detected.  Relying on
+        this (or some other) extension will adversely affect the portability of
+        curses applications.
+ 
+-       This implementation also contains several extensions:
++
++

    Extensions versus portability

    ++       Most  of the extensions provided by ncurses have not been standardized.
++       Some  have  been  incorporated  into  other  implementations,  such  as
++       PDCurses or NetBSD curses.  Here are a few to consider:
+ 
+        o   The routine has_key is not part of XPG4, nor is it present in SVr4.
+            See the curs_getch(3x) manual page for details.
+ 
+-       o   The  routine  slk_attr  is  not  part of XPG4, nor is it present in
++       o   The routine slk_attr is not part of XPG4,  nor  is  it  present  in
+            SVr4.  See the curs_slk(3x) manual page for details.
+ 
+-       o   The routines getmouse, mousemask,  ungetmouse,  mouseinterval,  and
+-           wenclose  relating  to  mouse interfacing are not part of XPG4, nor
+-           are they present in SVr4.  See the curs_mouse(3x) manual  page  for
++       o   The  routines  getmouse,  mousemask, ungetmouse, mouseinterval, and
++           wenclose relating to mouse interfacing are not part  of  XPG4,  nor
++           are  they  present in SVr4.  See the curs_mouse(3x) manual page for
+            details.
+ 
+-       o   The  routine  mcprint was not present in any previous curses imple-
++       o   The routine mcprint was not present in any previous  curses  imple-
+            mentation.  See the curs_print(3x) manual page for details.
+ 
+        o   The routine wresize is not part of XPG4, nor is it present in SVr4.
+@@ -1308,26 +1317,97 @@
+            tion programs.  See curs_opaque(3x) for the discussion of is_scrol-
+            lok, etc.
+ 
+-       o   This  implementation  can be configured to provide rudimentary sup-
+-           port for multi-threaded  applications.   See  curs_threads(3x)  for
++       o   This implementation can be configured to provide  rudimentary  sup-
++           port  for  multi-threaded  applications.   See curs_threads(3x) for
+            details.
+ 
+-       o   This  implementation  can  also  be  configured to provide a set of
+-           functions which improve the ability  to  manage  multiple  screens.
++       o   This implementation can also be configured  to  provide  a  set  of
++           functions  which  improve  the  ability to manage multiple screens.
+            See curs_sp_funcs(3x) for details.
+ 
+-       In  historic  curses  versions, delays embedded in the capabilities cr,
+-       ind, cub1, ff and tab activated corresponding delay bits  in  the  UNIX
++
++

    Padding differences

    ++       In historic curses versions, delays embedded in  the  capabilities  cr,
++       ind,  cub1,  ff  and tab activated corresponding delay bits in the UNIX
+        tty driver.  In this implementation, all padding is done by sending NUL
+-       bytes.  This method is slightly more expensive, but narrows the  inter-
+-       face  to  the  UNIX  kernel  significantly  and increases the package's
++       bytes.   This method is slightly more expensive, but narrows the inter-
++       face to the UNIX  kernel  significantly  and  increases  the  package's
+        portability correspondingly.
+ 
+ 
+-

    NOTES

    +-       The header file <curses.h>  automatically  includes  the  header  files
++

    Header files

    ++       The  header  file  <curses.h>  automatically  includes the header files
+        <stdio.h> and <unctrl.h>.
+ 
++       X/Open Curses has more to say, but does not finish the story:
++
++           The inclusion of <curses.h> may make visible all symbols  from  the
++           headers <stdio.h>, <term.h>, <termios.h>, and <wchar.h>.
++
++       Here is a more complete story:
++
++       o   Starting   with  BSD  curses,  all  implementations  have  included
++           <stdio.h>.
++
++           BSD curses included <curses.h>  and  <unctrl.h>  from  an  internal
++           header "curses.ext" ("ext" was a short name for externs).
++
++           BSD  curses  used  <stdio.h> internally (for printw and scanw), but
++           nothing in <curses.h> itself relied upon <stdio.h>.
++
++       o   SVr2 curses added newterm(3x), which relies upon  <stdio.h>.   That
++           is, the function prototype uses FILE.
++
++           SVr4 curses added putwin and getwin, which also use <stdio.h>.
++
++           X/Open Curses documents all three of these functions.
++
++           SVr4  curses  and  X/Open  Curses  do  not require the developer to
++           include  <stdio.h>  before  including  <curses.h>.   Both  document
++           curses showing <curses.h> as the only required header.
++
++           As a result, standard <curses.h> will always include <stdio.h>.
++
++       o   X/Open  Curses is inconsistent with respect to SVr4 regarding <unc-
++           trl.h>.
++
++           As  noted  in  curs_util(3x),  ncurses  includes  <unctrl.h>   from
++           <curses.h> (like SVr4).
++
++       o   X/Open's comments about <term.h> and <termios.h> may refer to HP-UX
++           and AIX:
++
++           HP-UX curses includes <term.h> from <curses.h> to declare setupterm
++           in curses.h, but ncurses (and Solaris curses) do not.
++
++           AIX  curses includes <term.h> and <termios.h>.  Again, ncurses (and
++           Solaris curses) do not.
++
++       o   X/Open says that <curses.h> may include <term.h>, but there  is  no
++           requirement that it do that.
++
++           Some  programs  use  functions  declared  in  both  <curses.h>  and
++           <term.h>, and must include both headers in the same  module.   Very
++           old  versions  of  AIX  curses required including <curses.h> before
++           including <term.h>.
++
++           Because ncurses header files include the headers needed  to  define
++           datatypes used in the headers, ncurses header files can be included
++           in any order.  But for portability, you should  include  <curses.h>
++           before <term.h>.
++
++       o   X/Open  Curses  says  "may make visible" because including a header
++           file does not necessarily make all symbols in it visible (there are
++           ifdef's to consider).
++
++           For  instance,  in  ncurses <wchar.h> may be included if the proper
++           symbol is defined, and if ncurses is configured for  wide-character
++           support.   If the header is included, its symbols may be made visi-
++           ble.  That depends on the value used for _XOPEN_SOURCE feature test
++           macro.
++
++
++

    NOTES

    +        If  standard  output from a ncurses program is re-directed to something
+        which is not a tty, screen updates will be directed to standard  error.
+        This was an undocumented feature of AT&T System V Release 3 curses.
+@@ -1384,7 +1464,14 @@
+ 
  • FILES
    • 
+ 
  • SEE ALSO
    • 
+ 
  • EXTENSIONS
    • 
+-
  • PORTABILITY
    • 
++
  • PORTABILITY
++
++
    • 
+ 
  • NOTES
    • 
+ 
  • AUTHORS
    • 
+ 
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.2-20200215+/doc/html/man/ncurses6-config.1.html	2020-02-15 21:04:15.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/ncurses6-config.1.html	2020-02-23 01:14:21.000000000 +0000
+@@ -113,7 +113,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.2-20200215+/doc/html/man/panel.3x.html	2020-02-15 21:18:25.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/panel.3x.html	2020-02-23 01:14:21.000000000 +0000
+@@ -281,7 +281,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.2-20200215+/doc/html/man/tabs.1.html	2020-02-15 21:04:15.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/tabs.1.html	2020-02-23 01:14:21.000000000 +0000
+@@ -206,7 +206,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.2-20200215+/doc/html/man/terminfo.5.html	2020-02-15 21:04:16.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/terminfo.5.html	2020-02-23 01:14:21.000000000 +0000
+@@ -105,7 +105,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This manual describes ncurses version 6.2 (patch 20200215).
++       This manual describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+

    Terminfo Entry Syntax

    +Index: doc/html/man/tic.1m.html
+--- ncurses-6.2-20200215+/doc/html/man/tic.1m.html	2020-02-15 21:04:16.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/tic.1m.html	2020-02-23 01:14:21.000000000 +0000
+@@ -461,7 +461,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.2-20200215+/doc/html/man/toe.1m.html	2020-02-15 21:04:16.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/toe.1m.html	2020-02-23 01:14:21.000000000 +0000
+@@ -171,7 +171,7 @@
+        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
+        minfo(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.2-20200215+/doc/html/man/tput.1.html	2020-02-15 21:04:16.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/tput.1.html	2020-02-23 01:14:21.000000000 +0000
+@@ -523,7 +523,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.2-20200215+/doc/html/man/tset.1.html	2020-02-15 21:04:16.000000000 +0000
++++ ncurses-6.2-20200222/doc/html/man/tset.1.html	2020-02-23 01:14:22.000000000 +0000
+@@ -390,7 +390,7 @@
+        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.2 (patch 20200215).
++       This describes ncurses version 6.2 (patch 20200222).
+ 
+ 
+ 
+Index: form/Makefile.in
+Prereq:  1.65 
+--- ncurses-6.2-20200215+/form/Makefile.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200222/form/Makefile.in	2020-02-22 16:32:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.65 2020/02/02 23:34:34 tom Exp $
++# $Id: Makefile.in,v 1.67 2020/02/22 16:32:11 tom Exp $
+ ##############################################################################
+ # Copyright 2020 Thomas E. Dickey                                            #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
+@@ -92,7 +92,9 @@
+ CPP		= @CPP@
+ CFLAGS		= @CFLAGS@
+ 
+-CPPFLAGS	= -I${top_srcdir}/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
++INCDIR		= $(top_srcdir)/include
++BASE_DIR 	= $(top_srcdir)/ncurses
++CPPFLAGS	= -I$(BASE_DIR) -DHAVE_CONFIG_H @CPPFLAGS@
+ 
+ CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
+ 
+@@ -149,11 +151,24 @@
+ 	cp $(srcdir)/form.h $@
+ 
+ HEADER_DEPS = \
+-	$(srcdir)/form.priv.h \
+-	$(srcdir)/form.h \
+-	../include/mf_common.h \
+ 	../include/curses.h \
+-	../include/eti.h
++	../include/eti.h \
++	../include/mf_common.h \
++	../include/ncurses_cfg.h \
++	../include/ncurses_def.h \
++	../include/ncurses_dll.h \
++	../include/term.h \
++	../include/unctrl.h \
++	$(BASE_DIR)/curses.priv.h \
++	$(BASE_DIR)/new_pair.h \
++	$(INCDIR)/nc_alloc.h \
++	$(INCDIR)/nc_panel.h \
++	$(INCDIR)/nc_string.h \
++	$(INCDIR)/nc_termios.h \
++	$(INCDIR)/nc_tparm.h \
++	$(INCDIR)/term_entry.h \
++	$(srcdir)/form.h \
++	$(srcdir)/form.priv.h
+ 
+ tags:
+ 	$(CTAGS) *.[ch]
+Index: include/Makefile.in
+Prereq:  1.46 
+--- ncurses-6.2-20200215+/include/Makefile.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200222/include/Makefile.in	2020-02-19 23:54:22.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.46 2020/02/02 23:34:34 tom Exp $
++# $Id: Makefile.in,v 1.48 2020/02/19 23:54:22 tom Exp $
+ ##############################################################################
+ # Copyright 2019,2020 Thomas E. Dickey                                       #
+ # Copyright 1998-2013,2015 Free Software Foundation, Inc.                    #
+@@ -28,7 +28,7 @@
+ # authorization.                                                             #
+ ##############################################################################
+ #
+-# Author: Thomas E. Dickey 1996-2001
++# Author: Thomas E. Dickey 1996-on
+ #
+ # Makefile for ncurses source code.
+ #
+@@ -59,6 +59,10 @@
+ AWK		= @AWK@
+ LN_S		= @LN_S@
+ 
++CC		= @CC@
++CFLAGS		= @CFLAGS@
++CPPFLAGS	= -DHAVE_CONFIG_H -I. @CPPFLAGS@
++
+ CTAGS		= @CTAGS@
+ ETAGS		= @ETAGS@
+ 
+@@ -141,6 +145,17 @@
+ 
+ realclean :: distclean
+ 
++# Verify that each header-file can be compiled without including another.
++check:
++	@$(SHELL) -c "for header in *.h;\
++		do \
++			echo \"** testing \$${header}\" ; \
++			echo \"#include <\$${header}>\" >headers.c; \
++			echo \"int main(void) { return 0; }\" >>headers.c; \
++			$(CC) -c $(CFLAGS) $(CPPFLAGS) headers.c; \
++		done"
++	-@rm -f headers.*
++
+ ###############################################################################
+ # The remainder of this file is automatically generated during configuration
+ ###############################################################################
+Index: man/ncurses.3x
+Prereq:  1.144 
+--- ncurses-6.2-20200215+/man/ncurses.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200222/man/ncurses.3x	2020-02-23 01:05:45.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.144 2020/02/02 23:34:34 tom Exp $
++.\" $Id: ncurses.3x,v 1.145 2020/02/23 01:05:45 tom Exp $
+ .hy 0
+ .TH ncurses 3X ""
+ .ie \n(.g .ds `` \(lq
+@@ -1354,6 +1354,10 @@
+ A small number of local differences (that is, individual differences between
+ the XSI Curses and \fBncurses\fR calls) are described in \fBPORTABILITY\fR
+ sections of the library man pages.
++.SS Error checking
++.PP
++In many cases, X/Open Curses is vague about error conditions,
++omitting some of the SVr4 documentation.
+ .PP
+ Unlike other implementations, this one checks parameters such as pointers
+ to WINDOW structures to ensure they are not null.
+@@ -1363,8 +1367,12 @@
+ to tell an application which of several possible errors were detected.
+ Relying on this (or some other) extension will adversely affect the
+ portability of curses applications.
++.SS Extensions versus portability
+ .PP
+-This implementation also contains several extensions:
++Most of the extensions provided by ncurses have not been standardized.
++Some have been incorporated into other implementations, such as
++PDCurses or NetBSD curses.
++Here are a few to consider:
+ .bP
+ The routine \fBhas_key\fR is not part of XPG4, nor is it present in SVr4.
+ See the \fBcurs_getch\fR(3X) manual page for details.
+@@ -1394,6 +1402,7 @@
+ This implementation can also be configured to provide a set of functions which
+ improve the ability to manage multiple screens.
+ See \fBcurs_sp_funcs\fR(3X) for details.
++.SS Padding differences
+ .PP
+ In historic curses versions, delays embedded in the capabilities \fBcr\fR,
+ \fBind\fR, \fBcub1\fR, \fBff\fR and \fBtab\fR activated corresponding delay
+@@ -1402,10 +1411,80 @@
+ This method is slightly more expensive, but narrows the interface
+ to the UNIX kernel significantly and increases the package's portability
+ correspondingly.
+-.SH NOTES
++.SS Header files
+ The header file \fB\fR automatically includes the header files
+ \fB\fR and \fB\fR.
+ .PP
++X/Open Curses has more to say,
++but does not finish the story:
++.RS 4
++.PP
++The inclusion of  may make visible all symbols
++from the headers , , , and .
++.RE
++.PP
++Here is a more complete story:
++.bP
++Starting with BSD curses, all implementations have included .
++.IP
++BSD curses included  and  from an internal header
++"curses.ext" ("ext" was a short name for \fIexterns\fP).
++.IP
++BSD curses used  internally (for \fBprintw\fP and \fBscanw\fP),
++but nothing in  itself relied upon .
++.bP
++SVr2 curses added \fBnewterm\fP(3X), which relies upon .
++That is, the function prototype uses \fBFILE\fP.
++.IP
++SVr4 curses added \fBputwin\fP and \fBgetwin\fP, which also use .
++.IP
++X/Open Curses documents all three of these functions.
++.IP
++SVr4 curses and X/Open Curses do not require the developer to
++include  before including .
++Both document curses showing  as the only required header.
++.IP
++As a result, standard  will always include .
++.bP
++X/Open Curses is inconsistent with respect to SVr4 regarding .
++.IP
++As noted in \fBcurs_util\fP(3X), ncurses includes  from
++ (like SVr4).
++.bP
++X/Open's comments about  and  may refer to HP-UX and AIX:
++.IP
++HP-UX curses includes  from 
++to declare \fBsetupterm\fP in curses.h,
++but ncurses (and Solaris curses) do not.
++.IP
++AIX curses includes  and .
++Again, ncurses (and Solaris curses) do not.
++.bP
++X/Open says that  \fImay\fP include ,
++but there is no requirement that it do that.
++.IP
++Some programs use functions declared in both  and ,
++and must include both headers in the same module.
++Very old versions of AIX curses required including 
++before including .
++.IP
++Because ncurses header files include the headers needed to
++define datatypes used in the headers,
++ncurses header files can be included in any order.
++But for portability, you should include  before .
++.bP
++X/Open Curses says \fI"may make visible"\fP
++because including a header file does not necessarily make all symbols
++in it visible (there are ifdef's to consider).
++.IP
++For instance, in ncurses  \fImay\fP be included if
++the proper symbol is defined, and if ncurses is configured for
++wide-character support.
++If the header is included, its symbols may be made visible.
++That depends on the value used for \fB_XOPEN_SOURCE\fP
++feature test macro.
++.SH NOTES
++.PP
+ If standard output from a \fBncurses\fR program is re-directed to something
+ which is not a tty, screen updates will be directed to standard error.
+ This was an undocumented feature of AT&T System V Release 3 curses.
+Index: menu/Makefile.in
+Prereq:  1.66 
+--- ncurses-6.2-20200215+/menu/Makefile.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200222/menu/Makefile.in	2020-02-22 16:35:47.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.66 2020/02/02 23:34:34 tom Exp $
++# $Id: Makefile.in,v 1.67 2020/02/22 16:35:47 tom Exp $
+ ##############################################################################
+ # Copyright 2020 Thomas E. Dickey                                            #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
+@@ -92,7 +92,9 @@
+ CPP		= @CPP@
+ CFLAGS		= @CFLAGS@
+ 
+-CPPFLAGS	= -I${top_srcdir}/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
++INCDIR		= $(top_srcdir)/include
++BASE_DIR 	= $(top_srcdir)/ncurses
++CPPFLAGS	= -I$(BASE_DIR) -DHAVE_CONFIG_H @CPPFLAGS@
+ 
+ CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
+ 
+@@ -157,9 +159,22 @@
+ 	cp $(srcdir)/mf_common.h $@
+ 
+ HEADER_DEPS = \
++	../include/curses.h \
++	../include/ncurses_cfg.h \
++	../include/ncurses_def.h \
++	../include/ncurses_dll.h \
++	../include/term.h \
++	../include/unctrl.h \
++	$(BASE_DIR)/curses.priv.h \
++	$(BASE_DIR)/new_pair.h \
++	$(INCDIR)/nc_alloc.h \
++	$(INCDIR)/nc_panel.h \
++	$(INCDIR)/nc_string.h \
++	$(INCDIR)/nc_termios.h \
++	$(INCDIR)/nc_tparm.h \
++	$(INCDIR)/term_entry.h \
+ 	$(srcdir)/menu.priv.h \
+-	$(AUTO_SRC) \
+-	../include/curses.h
++	$(AUTO_SRC)
+ 
+ tags:
+ 	$(CTAGS) *.[ch]
+Index: misc/terminfo.src
+--- ncurses-6.2-20200215+/misc/terminfo.src	2020-01-19 01:09:38.000000000 +0000
++++ ncurses-6.2-20200222/misc/terminfo.src	2020-02-22 23:05:24.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.779 $
+-#	$Date: 2020/01/19 01:09:38 $
++#	$Revision: 1.787 $
++#	$Date: 2020/02/22 23:05:24 $
+ #
+ # 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
+@@ -2168,12 +2168,19 @@
+ # to a crude plotting feature) -TD
+ vt52|dec vt52,
+ 	OTbs,
++	it#8, lines#24,
++	acsc=+h.k0affggolpnqprrss, home=\EH, kbs=^H, nel=\r\n,
++	ri=\EI, rmacs=\EG, rmkx=\E>, smacs=\EF, smkx=\E=, u8=\E/[KL],
++	use=vt50h,
++
++# This is more likely the "vt52" that you would see in emulation, i.e., no
++# keypad, no graphics.
++vt52-basic|vt52 for emulators,
+ 	cols#80, it#8, lines#24,
+-	acsc=+h.k0affggolpnqprrss, bel=^G, clear=\EH\EJ, cr=\r,
+-	cub1=\ED, cud1=\EB, cuf1=\EC,
+-	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
+-	el=\EK, home=\EH, ht=^I, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB,
+-	kcuf1=\EC, kcuu1=\EA, nel=\r\n, ri=\EI, rmacs=\EG, smacs=\EF,
++	bel=^G, clear=\EH\EJ, cr=\r, cub1=\ED, cud1=\EB, cuf1=\EC,
++	cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK,
++	home=\EH, ht=^I, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB,
++	kcuf1=\EC, kcuu1=\EA, nel=\r\n, ri=\EI,
+ 
+ #### DEC VT100 and compatibles
+ #
+@@ -9451,7 +9458,7 @@
+ 	rep=%p1%c\E[%p2%db$<1*/>, rev=\E[7m, rmso=\E[m,
+ 	rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+ gator-52|HP 9000 model 237 emulating VT52,
+-	cols#128, lines#47, use=vt52,
++	cols#128, lines#47, use=vt52-basic,
+ gator-52t|HP 9000 model 237 emulating extra-tall VT52,
+ 	lines#94, use=gator-52,
+ 
+@@ -16983,8 +16990,8 @@
+ # Be sure the auto lf/cr switch is set to cr.
+ hz1552|hazeltine 1552,
+ 	OTbs,
+-	cud1=\n, dl1=\EO, il1=\EE, kf1=\EP, kf2=\EQ, kf3=\ER, lf1=blue,
+-	lf2=red, lf3=green, use=vt52,
++	cud1=\n, dl1=\EO, il1=\EE, lf1=blue, lf2=red, lf3=green,
++	use=vt52,
+ hz1552-rv|hazeltine 1552 reverse video,
+ 	cud1=\n, rmso=\ET, smso=\ES, use=hz1552,
+ # Note: h2000 won't work well because of a clash between upper case and ~'s.
+@@ -21693,11 +21700,41 @@
+ 
+ #### DEC terminals (Obsolete types: DECwriter and vt40/42/50)
+ #
+-# These entries are DEC's official terminfos for its older terminals.
+-# Contact Bill Hedberg  of Terminal Support
+-# Engineering for more information.  Updated terminfos and termcaps
+-# are kept available at ftp://gatekeeper.dec.com/pub/DEC/termcaps.
++# These entries came from DEC's official terminfos for its older terminals
++# (which happen to be identical to the AT&T/SCO terminal descriptions),
++# Bill Hedberg  of Terminal Support Engineering
++# may have had more information.  Updated terminfos and termcaps were available
++# at ftp://gatekeeper.dec.com/pub/DEC/termcaps.
++
++# DEC's terminfos did not describe the auxiliary keypad.
++#
++# DECScope of course had no "function keys", but this building block assigns
++# the three blank keys at the top of the auxiliary (numeric) keypad, using
++# the same analogy as vt100 (also lacking function-keys).
+ #
++# These assignments use the same layout for 0-9 as vt100+keypad; the vt52
++# keypad had its cursor-keys on the right-column as shown -TD
++#   _______________________________________
++#  |   PF1   |   PF2   |   PF3   | c-up    |
++#  |   \EP   |   \EQ   |   \ER   |   \EA   |
++#  |_kf1__k1_|_kf2__k2_|_kf3__k3_|kcuu1_k4_|
++#  |    7         8         9      c-down  |
++#  |   \E?w  |   \E?x  |   \E?y  |   \EB   |
++#  |_kf9__k9_|_kf10_k;_|_kf0__k0_|kcud1____|
++#  |    4    |    5    |    6    | c-right |
++#  |   \E?t  |   \E?u  |   \E?v  |   \EC   |
++#  |_kf5__k5_|_kf6__k6_|_kf7__k7_|kcuf1_k8_|
++#  |    1    |    2    |    3    | c-left  |
++#  |   \E?q  |   \E?r  |   \E?s  |   \ED   |
++#  |_ka1__K1_|_kb2__K2_|_ka3__K3_|kcub1____|
++#  |         0         |   .     |  enter  |
++#  |        \E?p       |  \E?n   |  \E?M   |
++#  |___kc1_______K4____|_kc3__K5_|_kent_@8_|
++#
++vt52+keypad|DECScope auxiliary keypad,
++	ka1=\E?q, ka3=\E?s, kb2=\E?r, kc1=\E?p, kc3=\E?n, kf0=\E?y,
++	kf1=\EP, kf2=\EQ, kf3=\ER, kf5=\E?t, kf6=\E?u, kf7=\E?v,
++	kf8=\E?w, kf9=\E?x,
+ 
+ gt40|dec gt40,
+ 	OTbs, os,
+@@ -21707,17 +21744,17 @@
+ 	OTbs, os,
+ 	cols#72, lines#40,
+ 	bel=^G, cr=\r, cub1=^H, cud1=\n,
++
+ vt50|dec vt50,
+ 	OTbs,
+ 	cols#80, lines#12,
+ 	bel=^G, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
+-	cuu1=\EA, ed=\EJ, el=\EK, ht=^I, ind=\n,
++	cuu1=\EA, ed=\EJ, el=\EK, ht=^I, ind=\n, u8=\E/A, u9=\EZ,
+ vt50h|dec vt50h,
+-	OTbs,
+-	cols#80, lines#12,
+-	bel=^G, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
+-	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
+-	el=\EK, ht=^I, ind=\n, ri=\EI,
++	cub1=\ED, cud1=\EB, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
++	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, u8=\E/[HJ],
++	use=vt52+keypad, use=vt50,
++
+ # (vt61: there's a BSD termcap that claims ,  )
+ vt61|vt-61|vt61.5|dec vt61,
+ 	cols#80, lines#24,
+@@ -26435,4 +26472,8 @@
+ #	+ spelling fixes per codespell -TD
+ #	+ improve xm example for xterm+x11mouse, xterm+sm+1006 -TD
+ #
++# 2020-02-22
++#	+ improve vt50h and vt52 based on DECScope manual -TD
++#	+ add/use vt52+keypad and vt52-basic -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/Makefile.in
+Prereq:  1.168 
+--- ncurses-6.2-20200215+/ncurses/Makefile.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200222/ncurses/Makefile.in	2020-02-22 15:45:23.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.168 2020/02/02 23:34:34 tom Exp $
++# $Id: Makefile.in,v 1.169 2020/02/22 15:45:23 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
+@@ -178,16 +178,21 @@
+ 	keys.list
+ 
+ HEADER_DEPS	= \
+-	$(srcdir)/curses.priv.h \
+-	../include/ncurses_dll.h \
+ 	../include/ncurses_cfg.h \
++	../include/ncurses_def.h \
++	../include/ncurses_dll.h \
+ 	../include/curses.h \
+-	$(INCDIR)/nc_panel.h \
+ 	../include/term.h \
+-	$(INCDIR)/term_entry.h \
+-	$(INCDIR)/nc_tparm.h \
++	../include/unctrl.h \
+ 	$(INCDIR)/nc_alloc.h \
+-	$(INCDIR)/nc_mingw.h
++	$(INCDIR)/nc_mingw.h \
++	$(INCDIR)/nc_panel.h \
++	$(INCDIR)/nc_string.h \
++	$(INCDIR)/nc_termios.h \
++	$(INCDIR)/nc_tparm.h \
++	$(INCDIR)/term_entry.h \
++	$(srcdir)/curses.priv.h \
++	$(srcdir)/new_pair.h
+ 
+ TEST_DEPS	= ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
+ TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
+Index: package/debian-mingw/changelog
+--- ncurses-6.2-20200215+/package/debian-mingw/changelog	2020-02-15 09:30:48.000000000 +0000
++++ ncurses-6.2-20200222/package/debian-mingw/changelog	2020-02-22 13:49:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200215) unstable; urgency=low
++ncurses6 (6.2+20200222) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Feb 2020 04:30:48 -0500
++ -- Thomas E. Dickey   Sat, 22 Feb 2020 08:49:45 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.2-20200215+/package/debian-mingw64/changelog	2020-02-15 09:30:48.000000000 +0000
++++ ncurses-6.2-20200222/package/debian-mingw64/changelog	2020-02-22 13:49:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200215) unstable; urgency=low
++ncurses6 (6.2+20200222) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Feb 2020 04:30:48 -0500
++ -- Thomas E. Dickey   Sat, 22 Feb 2020 08:49:45 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.2-20200215+/package/debian/changelog	2020-02-15 09:30:48.000000000 +0000
++++ ncurses-6.2-20200222/package/debian/changelog	2020-02-22 13:49:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200215) unstable; urgency=low
++ncurses6 (6.2+20200222) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Feb 2020 04:30:48 -0500
++ -- Thomas E. Dickey   Sat, 22 Feb 2020 08:49:45 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.378 
+--- ncurses-6.2-20200215+/package/mingw-ncurses.nsi	2020-02-15 09:30:48.000000000 +0000
++++ ncurses-6.2-20200222/package/mingw-ncurses.nsi	2020-02-22 13:49:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.378 2020/02/15 09:30:48 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.379 2020/02/22 13:49:45 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "2"
+ !define VERSION_YYYY  "2020"
+-!define VERSION_MMDD  "0215"
++!define VERSION_MMDD  "0222"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.2-20200215+/package/mingw-ncurses.spec	2020-02-15 09:30:48.000000000 +0000
++++ ncurses-6.2-20200222/package/mingw-ncurses.spec	2020-02-22 13:49:45.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.2
+-Release: 20200215
++Release: 20200222
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.2-20200215+/package/ncurses.spec	2020-02-15 09:30:48.000000000 +0000
++++ ncurses-6.2-20200222/package/ncurses.spec	2020-02-22 13:49:45.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.2
+-Release: 20200215
++Release: 20200222
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.2-20200215+/package/ncursest.spec	2020-02-15 09:30:48.000000000 +0000
++++ ncurses-6.2-20200222/package/ncursest.spec	2020-02-22 13:49:45.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.2
+-Release: 20200215
++Release: 20200222
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: panel/Makefile.in
+Prereq:  1.71 
+--- ncurses-6.2-20200215+/panel/Makefile.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200222/panel/Makefile.in	2020-02-22 16:40:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.71 2020/02/02 23:34:34 tom Exp $
++# $Id: Makefile.in,v 1.72 2020/02/22 16:40:36 tom Exp $
+ ##############################################################################
+ # Copyright 2020 Thomas E. Dickey                                            #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
+@@ -94,7 +94,9 @@
+ CPP		= @CPP@
+ CFLAGS		= @CFLAGS@
+ 
+-CPPFLAGS	= -I${top_srcdir}/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
++INCDIR		= $(top_srcdir)/include
++BASE_DIR 	= $(top_srcdir)/ncurses
++CPPFLAGS	= -I$(BASE_DIR) -DHAVE_CONFIG_H @CPPFLAGS@
+ 
+ CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
+ 
+@@ -151,6 +153,20 @@
+ 	cp $(srcdir)/panel.h $@
+ 
+ HEADER_DEPS = \
++	../include/curses.h \
++	../include/ncurses_cfg.h \
++	../include/ncurses_def.h \
++	../include/ncurses_dll.h \
++	../include/term.h \
++	../include/unctrl.h \
++	$(BASE_DIR)/curses.priv.h \
++	$(BASE_DIR)/new_pair.h \
++	$(INCDIR)/nc_alloc.h \
++	$(INCDIR)/nc_panel.h \
++	$(INCDIR)/nc_string.h \
++	$(INCDIR)/nc_termios.h \
++	$(INCDIR)/nc_tparm.h \
++	$(INCDIR)/term_entry.h \
+ 	$(srcdir)/panel.priv.h \
+ 	$(srcdir)/panel.h
+ 
+Index: test/Makefile.in
+Prereq:  1.121 
+--- ncurses-6.2-20200215+/test/Makefile.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200222/test/Makefile.in	2020-02-22 16:51:31.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.121 2020/02/02 23:34:34 tom Exp $
++# $Id: Makefile.in,v 1.122 2020/02/22 16:51:31 tom Exp $
+ ##############################################################################
+ # Copyright 2020 Thomas E. Dickey                                            #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
+@@ -137,8 +137,16 @@
+ LINT_OPTS	= @LINT_OPTS@
+ LINT_LIBS	= -lform -lmenu -lpanel -lncurses @LIBS@
+ 
++INCDIR		= $(top_srcdir)/include
++
+ HEADER_DEPS	= \
+ 	../include/curses.h \
+-	../include/term.h
++	../include/term.h \
++	../include/ncurses_cfg.h \
++	../include/ncurses_def.h \
++	../include/ncurses_dll.h \
++	../include/term.h \
++	../include/unctrl.h \
++	$(INCDIR)/nc_alloc.h
+ 
+ # The rest is generated from the "programs" and "modules" files...
diff --git a/ncurses-6.2-20200229.patch b/ncurses-6.2-20200229.patch
new file mode 100644
index 0000000..7b285dc
--- /dev/null
+++ b/ncurses-6.2-20200229.patch
@@ -0,0 +1,27919 @@
+# ncurses 6.2 - patch 20200229 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.2 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.2 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.2
+#	http://invisible-mirror.net/archives/ncurses/6.2 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200229.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Mar  1 01:58:39 UTC 2020
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                 |   44 
+# Ada95/configure                  | 2631 ++++++++++++++++-----------
+# NEWS                             |   20 
+# VERSION                          |    2 
+# aclocal.m4                       |   39 
+# c++/cursslk.h                    |   14 
+# c++/etip.h.in                    |    3 
+# configure                        | 3523 ++++++++++++++++++-------------------
+# dist.mk                          |    4 
+# form/fty_regex.c                 |    6 
+# include/nc_mingw.h               |    4 
+# include/ncurses_defs             |    4 
+# include/ncurses_dll.h.in         |    4 
+# include/term_entry.h             |    6 
+# ncurses/tinfo/comp_parse.c       |    4 
+# ncurses/tty/lib_twait.c          |    4 
+# ncurses/win32con/gettimeofday.c  |    6 
+# ncurses/win32con/win_driver.c    |   22 
+# package/debian-mingw/changelog   |    4 
+# package/debian-mingw64/changelog |    4 
+# package/debian/changelog         |    4 
+# package/mingw-ncurses.nsi        |    4 
+# package/mingw-ncurses.spec       |    2 
+# package/ncurses.spec             |    2 
+# package/ncursest.spec            |    2 
+# progs/progs.priv.h               |    6 
+# test/aclocal.m4                  |   44 
+# test/configure                   | 2584 +++++++++++++++------------
+# 28 files changed, 5076 insertions(+), 3920 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.153 
+--- ncurses-6.2-20200222+/Ada95/aclocal.m4	2020-02-08 21:04:00.000000000 +0000
++++ ncurses-6.2-20200229/Ada95/aclocal.m4	2020-02-27 10:21:59.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.153 2020/02/08 21:04:00 tom Exp $
++dnl $Id: aclocal.m4,v 1.154 2020/02/27 10:21:59 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -2576,7 +2576,7 @@
+ 	,[$1=no])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_NCURSES_CONFIG version: 21 updated: 2018/06/20 20:23:13
++dnl CF_NCURSES_CONFIG version: 23 updated: 2020/02/27 05:21:59
+ dnl -----------------
+ dnl Tie together the configure-script macros for ncurses, preferring these in
+ dnl order:
+@@ -2598,11 +2598,47 @@
+ 		AC_MSG_CHECKING(if the $cf_ncuconfig_root package files work)
+ 		cf_have_ncuconfig=unknown
+ 
++		cf_save_CFLAGS="$CFLAGS"
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+ 		cf_save_LIBS="$LIBS"
+ 
+-		CF_ADD_CFLAGS(`$PKG_CONFIG --cflags $cf_ncuconfig_root`)
+-		CF_ADD_LIBS(`$PKG_CONFIG --libs $cf_ncuconfig_root`)
++		cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
++		cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
++
++		# while -W for passing linker flags is prevalent, it is not "standard". 
++		# At least one wrapper for c89/c99 (in Apple's xcode) has its own
++		# incompatible _and_ non-standard -W option which gives an error.  Work
++		# around that pitfall.
++		case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in
++		(x*c[[89]]9@@*-W*)
++			CF_ADD_CFLAGS($cf_pkg_cflags)
++			CF_ADD_LIBS($cf_pkg_libs)
++
++			AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
++				[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
++				[AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
++					int main(void)
++					{ char *xx = curses_version(); return (xx == 0); }],
++					[cf_test_ncuconfig=yes],
++					[cf_test_ncuconfig=no],
++					[cf_test_ncuconfig=maybe])],
++				[cf_test_ncuconfig=no])
++
++			CFLAGS="$cf_save_CFLAGS"
++			CPPFLAGS="$cf_save_CPPFLAGS"
++			LIBS="$cf_save_LIBS"
++
++			if test "x$cf_test_ncuconfig" != xyes; then
++				cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[[^ 	]]*//g'`
++				cf_pkg_cflags="$cf_temp"
++				cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[[^ 	]]*//g'`
++				cf_pkg_libs="$cf_temp"
++			fi
++			;;
++		esac
++
++		CF_ADD_CFLAGS($cf_pkg_cflags)
++		CF_ADD_LIBS($cf_pkg_libs)
+ 
+ 		AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+ 			[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+Index: Ada95/configure
+--- ncurses-6.2-20200222+/Ada95/configure	2020-02-08 21:05:36.000000000 +0000
++++ ncurses-6.2-20200229/Ada95/configure	2020-02-27 10:21:59.000000000 +0000
+@@ -4151,15 +4151,26 @@
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
++		cf_save_CFLAGS="$CFLAGS"
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+ 		cf_save_LIBS="$LIBS"
+ 
++		cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
++		cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
++
++		# while -W for passing linker flags is prevalent, it is not "standard".
++		# At least one wrapper for c89/c99 (in Apple's xcode) has its own
++		# incompatible _and_ non-standard -W option which gives an error.  Work
++		# around that pitfall.
++		case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in
++		(x*c[89]9@@*-W*)
++
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root`
++for cf_add_cflags in $cf_pkg_cflags
+ do
+ case $cf_fix_cppflags in
+ (no)
+@@ -4255,7 +4266,195 @@
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++# filter duplicates
++for cf_add_1lib in $cf_add_0lib; do
++	for cf_add_2lib in $cf_add_libs; do
++		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
++			cf_add_1lib=
++			break
++		fi
++	done
++	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
++done
++LIBS="$cf_add_libs"
++
++			cat >conftest.$ac_ext <<_ACEOF
++#line 4283 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++int
++main (void)
++{
++initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:4295: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:4298: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:4301: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:4304: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  if test "$cross_compiling" = yes; then
++  cf_test_ncuconfig=maybe
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4310 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++					int main(void)
++					{ char *xx = curses_version(); return (xx == 0); }
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:4317: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:4320: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:4322: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:4325: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_test_ncuconfig=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_test_ncuconfig=no
++fi
++rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_test_ncuconfig=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++
++			CFLAGS="$cf_save_CFLAGS"
++			CPPFLAGS="$cf_save_CPPFLAGS"
++			LIBS="$cf_save_LIBS"
++
++			if test "x$cf_test_ncuconfig" != xyes; then
++				cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ 	]*//g'`
++				cf_pkg_cflags="$cf_temp"
++				cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ 	]*//g'`
++				cf_pkg_libs="$cf_temp"
++			fi
++			;;
++		esac
++
++cf_fix_cppflags=no
++cf_new_cflags=
++cf_new_cppflags=
++cf_new_extra_cppflags=
++
++for cf_add_cflags in $cf_pkg_cflags
++do
++case $cf_fix_cppflags in
++(no)
++	case $cf_add_cflags in
++	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
++		case $cf_add_cflags in
++		(-D*)
++			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
++
++			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
++				&& test -z "${cf_tst_cflags}" \
++				&& cf_fix_cppflags=yes
++
++			if test $cf_fix_cppflags = yes ; then
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++				continue
++			elif test "${cf_tst_cflags}" = "\"'" ; then
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++				continue
++			fi
++			;;
++		esac
++		case "$CPPFLAGS" in
++		(*$cf_add_cflags)
++			;;
++		(*)
++			case $cf_add_cflags in
++			(-D*)
++				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
++
++CPPFLAGS=`echo "$CPPFLAGS" | \
++	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
++		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
++
++				;;
++			esac
++
++	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
++	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
++
++			;;
++		esac
++		;;
++	(*)
++
++	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
++	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
++
++		;;
++	esac
++	;;
++(yes)
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
++
++	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
++		&& test -z "${cf_tst_cflags}" \
++		&& cf_fix_cppflags=no
++	;;
++esac
++done
++
++if test -n "$cf_new_cflags" ; then
++
++	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
++	CFLAGS="${CFLAGS}$cf_new_cflags"
++
++fi
++
++if test -n "$cf_new_cppflags" ; then
++
++	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
++	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
++
++fi
++
++if test -n "$cf_new_extra_cppflags" ; then
++
++	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
++	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
++
++fi
++
++cf_add_libs="$LIBS"
++# reverse order
++cf_add_0lib=
++for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -4269,7 +4468,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 4272 "configure"
++#line 4471 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -4281,37 +4480,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4284: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4483: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4287: \$? = $ac_status" >&5
++  echo "$as_me:4486: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4290: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4293: \$? = $ac_status" >&5
++  echo "$as_me:4492: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4299 "configure"
++#line 4498 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:4306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4505: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4309: \$? = $ac_status" >&5
++  echo "$as_me:4508: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:4311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4510: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4314: \$? = $ac_status" >&5
++  echo "$as_me:4513: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -4328,7 +4527,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:4331: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:4530: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -4344,7 +4543,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:4347: checking for terminfo header" >&5
++echo "$as_me:4546: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4362,7 +4561,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4365 "configure"
++#line 4564 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -4377,16 +4576,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4380: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4383: \$? = $ac_status" >&5
++  echo "$as_me:4582: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4386: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4389: \$? = $ac_status" >&5
++  echo "$as_me:4588: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -4402,7 +4601,7 @@
+ done
+ 
+ fi
+-echo "$as_me:4405: result: $cf_cv_term_header" >&5
++echo "$as_me:4604: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -4437,7 +4636,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:4440: result: no" >&5
++		echo "$as_me:4639: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -4453,7 +4652,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:4456: checking for $ac_word" >&5
++echo "$as_me:4655: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4468,7 +4667,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:4471: found $ac_dir/$ac_word" >&5
++echo "$as_me:4670: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4476,10 +4675,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:4479: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:4678: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:4482: result: no" >&5
++  echo "$as_me:4681: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4492,7 +4691,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:4495: checking for $ac_word" >&5
++echo "$as_me:4694: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4507,7 +4706,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:4510: found $ac_dir/$ac_word" >&5
++echo "$as_me:4709: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4515,10 +4714,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:4518: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:4717: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:4521: result: no" >&5
++  echo "$as_me:4720: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4647,7 +4846,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:4650: checking if we have identified curses headers" >&5
++echo "$as_me:4849: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4659,7 +4858,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4662 "configure"
++#line 4861 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -4671,16 +4870,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4873: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4677: \$? = $ac_status" >&5
++  echo "$as_me:4876: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4879: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4683: \$? = $ac_status" >&5
++  echo "$as_me:4882: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -4691,11 +4890,11 @@
+ done
+ 
+ fi
+-echo "$as_me:4694: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:4893: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:4698: error: No curses header-files found" >&5
++	{ { echo "$as_me:4897: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -4705,23 +4904,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:4708: checking for $ac_header" >&5
++echo "$as_me:4907: 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 4714 "configure"
++#line 4913 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:4718: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4917: \"$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:4724: \$? = $ac_status" >&5
++  echo "$as_me:4923: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4740,7 +4939,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:4743: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:4942: 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 <conftest.$ac_ext <<_ACEOF
+-#line 4799 "configure"
++#line 4998 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4808,16 +5007,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4811: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5010: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4814: \$? = $ac_status" >&5
++  echo "$as_me:5013: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4820: \$? = $ac_status" >&5
++  echo "$as_me:5019: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -4834,7 +5033,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:4837: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5036: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4853,7 +5052,7 @@
+ 
+ }
+ 
+-echo "$as_me:4856: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5055: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4865,7 +5064,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4868 "configure"
++#line 5067 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -4889,16 +5088,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4892: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5091: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4895: \$? = $ac_status" >&5
++  echo "$as_me:5094: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5097: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4901: \$? = $ac_status" >&5
++  echo "$as_me:5100: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -4913,14 +5112,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:4916: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:5115: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:4923: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:5122: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5041,7 +5240,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 5044 "configure"
++#line 5243 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5053,16 +5252,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5056: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5255: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5059: \$? = $ac_status" >&5
++  echo "$as_me:5258: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5062: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5261: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5065: \$? = $ac_status" >&5
++  echo "$as_me:5264: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -5079,7 +5278,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:5082: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5281: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5102,7 +5301,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 5105 "configure"
++#line 5304 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5126,16 +5325,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5129: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5328: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5132: \$? = $ac_status" >&5
++  echo "$as_me:5331: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5135: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5138: \$? = $ac_status" >&5
++  echo "$as_me:5337: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -5156,12 +5355,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5159: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5358: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:5164: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:5363: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
+@@ -5197,7 +5396,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 5200 "configure"
++#line 5399 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5209,16 +5408,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5212: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5411: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5215: \$? = $ac_status" >&5
++  echo "$as_me:5414: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5218: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5221: \$? = $ac_status" >&5
++  echo "$as_me:5420: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -5235,7 +5434,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:5238: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5437: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5283,7 +5482,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:5286: checking for terminfo header" >&5
++echo "$as_me:5485: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5301,7 +5500,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5304 "configure"
++#line 5503 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5316,16 +5515,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5319: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5518: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5322: \$? = $ac_status" >&5
++  echo "$as_me:5521: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5328: \$? = $ac_status" >&5
++  echo "$as_me:5527: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5341,7 +5540,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5344: result: $cf_cv_term_header" >&5
++echo "$as_me:5543: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5379,7 +5578,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:5382: checking for ncurses version" >&5
++echo "$as_me:5581: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5405,10 +5604,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:5408: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:5607: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5411: \$? = $ac_status" >&5
++  echo "$as_me:5610: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -5418,7 +5617,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5421 "configure"
++#line 5620 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5443,15 +5642,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:5446: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5645: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5449: \$? = $ac_status" >&5
++  echo "$as_me:5648: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:5451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5650: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5454: \$? = $ac_status" >&5
++  echo "$as_me:5653: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -5465,7 +5664,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:5468: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:5667: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -5478,7 +5677,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:5481: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:5680: 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
+@@ -5486,7 +5685,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5489 "configure"
++#line 5688 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5505,16 +5704,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5508: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5707: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5511: \$? = $ac_status" >&5
++  echo "$as_me:5710: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5514: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5713: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5517: \$? = $ac_status" >&5
++  echo "$as_me:5716: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -5525,10 +5724,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5528: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:5727: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+-  echo "$as_me:5531: checking for initscr in -lgpm" >&5
++  echo "$as_me:5730: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5536,7 +5735,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5539 "configure"
++#line 5738 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5555,16 +5754,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5757: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5561: \$? = $ac_status" >&5
++  echo "$as_me:5760: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5763: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5567: \$? = $ac_status" >&5
++  echo "$as_me:5766: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -5575,7 +5774,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5578: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:5777: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test $ac_cv_lib_gpm_initscr = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -5590,7 +5789,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:5593: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:5792: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5598,7 +5797,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5601 "configure"
++#line 5800 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5617,16 +5816,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5620: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5819: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5623: \$? = $ac_status" >&5
++  echo "$as_me:5822: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5825: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5629: \$? = $ac_status" >&5
++  echo "$as_me:5828: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -5637,7 +5836,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5640: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:5839: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -5686,13 +5885,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:5689: checking for initscr" >&5
++	echo "$as_me:5888: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5695 "configure"
++#line 5894 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -5723,16 +5922,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5726: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5925: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5729: \$? = $ac_status" >&5
++  echo "$as_me:5928: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5732: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5735: \$? = $ac_status" >&5
++  echo "$as_me:5934: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -5742,18 +5941,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5745: result: $ac_cv_func_initscr" >&5
++echo "$as_me:5944: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test $ac_cv_func_initscr = yes; then
+   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:5752: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:5951: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5756 "configure"
++#line 5955 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5765,25 +5964,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5768: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5967: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5771: \$? = $ac_status" >&5
++  echo "$as_me:5970: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5774: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5973: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5777: \$? = $ac_status" >&5
++  echo "$as_me:5976: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:5779: result: yes" >&5
++  echo "$as_me:5978: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:5786: result: no" >&5
++echo "$as_me:5985: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -5851,11 +6050,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:5854: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:6053: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 5858 "configure"
++#line 6057 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5867,25 +6066,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6069: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5873: \$? = $ac_status" >&5
++  echo "$as_me:6072: \$? = $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:6075: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5879: \$? = $ac_status" >&5
++  echo "$as_me:6078: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:5881: result: yes" >&5
++  echo "$as_me:6080: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:5888: result: no" >&5
++echo "$as_me:6087: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -5900,7 +6099,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:5903: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:6102: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5908,7 +6107,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:5911: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:6110: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -5918,7 +6117,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 5921 "configure"
++#line 6120 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5930,23 +6129,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5933: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6132: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5936: \$? = $ac_status" >&5
++  echo "$as_me:6135: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5939: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6138: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5942: \$? = $ac_status" >&5
++  echo "$as_me:6141: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:5944: result: yes" >&5
++  echo "$as_me:6143: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:5949: result: no" >&5
++echo "$as_me:6148: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -5964,7 +6163,7 @@
+ 	NCURSES_CONFIG=none
+ fi
+ 
+-echo "$as_me:5967: checking if you want wide-character code" >&5
++echo "$as_me:6166: 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.
+@@ -5974,11 +6173,11 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:5977: result: $with_widec" >&5
++echo "$as_me:6176: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ if test "$with_widec" = yes ; then
+ 
+-echo "$as_me:5981: checking for multibyte character support" >&5
++echo "$as_me:6180: 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
+@@ -5986,7 +6185,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 5989 "configure"
++#line 6188 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -5999,16 +6198,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6002: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6005: \$? = $ac_status" >&5
++  echo "$as_me:6204: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6207: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6011: \$? = $ac_status" >&5
++  echo "$as_me:6210: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -6020,12 +6219,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:6023: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6222: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6028 "configure"
++#line 6227 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6038,16 +6237,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6041: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6240: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6044: \$? = $ac_status" >&5
++  echo "$as_me:6243: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6050: \$? = $ac_status" >&5
++  echo "$as_me:6249: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -6061,7 +6260,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6064 "configure"
++#line 6263 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6074,16 +6273,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6077: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6276: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6080: \$? = $ac_status" >&5
++  echo "$as_me:6279: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6083: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6282: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6086: \$? = $ac_status" >&5
++  echo "$as_me:6285: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -6100,9 +6299,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:6103: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:6302: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:6105: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6304: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -6193,7 +6392,7 @@
+ 		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}:6196: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6395: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -6201,7 +6400,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 6204 "configure"
++#line 6403 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6214,21 +6413,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6217: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6416: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6220: \$? = $ac_status" >&5
++  echo "$as_me:6419: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6223: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6422: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6226: \$? = $ac_status" >&5
++  echo "$as_me:6425: \$? = $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}:6231: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6430: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -6246,7 +6445,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:6249: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6448: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -6321,13 +6520,13 @@
+ 				if test -d $cf_cv_library_path_utf8 ; then
+ 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:6324: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6523: 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 6330 "configure"
++#line 6529 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6340,21 +6539,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6343: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6542: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6346: \$? = $ac_status" >&5
++  echo "$as_me:6545: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6548: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6352: \$? = $ac_status" >&5
++  echo "$as_me:6551: \$? = $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}:6357: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6556: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -6396,7 +6595,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6399: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:6598: 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
+@@ -6434,7 +6633,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 6437 "configure"
++#line 6636 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6446,16 +6645,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6449: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6648: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6452: \$? = $ac_status" >&5
++  echo "$as_me:6651: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6458: \$? = $ac_status" >&5
++  echo "$as_me:6657: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -6472,7 +6671,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:6475: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6674: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6508,7 +6707,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}:6511: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6710: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6538,25 +6737,224 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:6541: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:6740: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:6544: result: yes" >&5
++		echo "$as_me:6743: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:6547: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:6746: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
++		cf_save_CFLAGS="$CFLAGS"
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+ 		cf_save_LIBS="$LIBS"
+ 
++		cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
++		cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
++
++		# while -W for passing linker flags is prevalent, it is not "standard".
++		# At least one wrapper for c89/c99 (in Apple's xcode) has its own
++		# incompatible _and_ non-standard -W option which gives an error.  Work
++		# around that pitfall.
++		case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in
++		(x*c[89]9@@*-W*)
++
++cf_fix_cppflags=no
++cf_new_cflags=
++cf_new_cppflags=
++cf_new_extra_cppflags=
++
++for cf_add_cflags in $cf_pkg_cflags
++do
++case $cf_fix_cppflags in
++(no)
++	case $cf_add_cflags in
++	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
++		case $cf_add_cflags in
++		(-D*)
++			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
++
++			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
++				&& test -z "${cf_tst_cflags}" \
++				&& cf_fix_cppflags=yes
++
++			if test $cf_fix_cppflags = yes ; then
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++				continue
++			elif test "${cf_tst_cflags}" = "\"'" ; then
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++				continue
++			fi
++			;;
++		esac
++		case "$CPPFLAGS" in
++		(*$cf_add_cflags)
++			;;
++		(*)
++			case $cf_add_cflags in
++			(-D*)
++				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
++
++CPPFLAGS=`echo "$CPPFLAGS" | \
++	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
++		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
++
++				;;
++			esac
++
++	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
++	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
++
++			;;
++		esac
++		;;
++	(*)
++
++	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
++	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
++
++		;;
++	esac
++	;;
++(yes)
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
++
++	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
++		&& test -z "${cf_tst_cflags}" \
++		&& cf_fix_cppflags=no
++	;;
++esac
++done
++
++if test -n "$cf_new_cflags" ; then
++
++	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
++	CFLAGS="${CFLAGS}$cf_new_cflags"
++
++fi
++
++if test -n "$cf_new_cppflags" ; then
++
++	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
++	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
++
++fi
++
++if test -n "$cf_new_extra_cppflags" ; then
++
++	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
++	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
++
++fi
++
++cf_add_libs="$LIBS"
++# reverse order
++cf_add_0lib=
++for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++# filter duplicates
++for cf_add_1lib in $cf_add_0lib; do
++	for cf_add_2lib in $cf_add_libs; do
++		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
++			cf_add_1lib=
++			break
++		fi
++	done
++	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
++done
++LIBS="$cf_add_libs"
++
++			cat >conftest.$ac_ext <<_ACEOF
++#line 6879 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++int
++main (void)
++{
++initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:6891: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:6894: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:6897: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:6900: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  if test "$cross_compiling" = yes; then
++  cf_test_ncuconfig=maybe
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6906 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++					int main(void)
++					{ char *xx = curses_version(); return (xx == 0); }
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:6913: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:6916: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:6918: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:6921: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_test_ncuconfig=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_test_ncuconfig=no
++fi
++rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_test_ncuconfig=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++
++			CFLAGS="$cf_save_CFLAGS"
++			CPPFLAGS="$cf_save_CPPFLAGS"
++			LIBS="$cf_save_LIBS"
++
++			if test "x$cf_test_ncuconfig" != xyes; then
++				cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ 	]*//g'`
++				cf_pkg_cflags="$cf_temp"
++				cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ 	]*//g'`
++				cf_pkg_libs="$cf_temp"
++			fi
++			;;
++		esac
++
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root`
++for cf_add_cflags in $cf_pkg_cflags
+ do
+ case $cf_fix_cppflags in
+ (no)
+@@ -6652,7 +7050,7 @@
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -6666,7 +7064,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6669 "configure"
++#line 7067 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6678,37 +7076,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6681: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6684: \$? = $ac_status" >&5
++  echo "$as_me:7082: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6690: \$? = $ac_status" >&5
++  echo "$as_me:7088: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6696 "configure"
++#line 7094 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:6703: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7101: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6706: \$? = $ac_status" >&5
++  echo "$as_me:7104: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:6708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6711: \$? = $ac_status" >&5
++  echo "$as_me:7109: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -6725,7 +7123,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:6728: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:7126: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -6741,7 +7139,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:6744: checking for terminfo header" >&5
++echo "$as_me:7142: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6759,7 +7157,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6762 "configure"
++#line 7160 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6774,16 +7172,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6777: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7175: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6780: \$? = $ac_status" >&5
++  echo "$as_me:7178: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6783: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7181: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6786: \$? = $ac_status" >&5
++  echo "$as_me:7184: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -6799,7 +7197,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6802: result: $cf_cv_term_header" >&5
++echo "$as_me:7200: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6834,7 +7232,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:6837: result: no" >&5
++		echo "$as_me:7235: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -6850,7 +7248,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:6853: checking for $ac_word" >&5
++echo "$as_me:7251: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6865,7 +7263,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:6868: found $ac_dir/$ac_word" >&5
++echo "$as_me:7266: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6873,10 +7271,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:6876: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:7274: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:6879: result: no" >&5
++  echo "$as_me:7277: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6889,7 +7287,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:6892: checking for $ac_word" >&5
++echo "$as_me:7290: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6904,7 +7302,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:6907: found $ac_dir/$ac_word" >&5
++echo "$as_me:7305: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6912,10 +7310,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:6915: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:7313: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:6918: result: no" >&5
++  echo "$as_me:7316: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7044,7 +7442,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:7047: checking if we have identified curses headers" >&5
++echo "$as_me:7445: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7056,7 +7454,7 @@
+ 	curses.h ncursesw/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7059 "configure"
++#line 7457 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7068,16 +7466,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7071: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7469: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7074: \$? = $ac_status" >&5
++  echo "$as_me:7472: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7475: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7080: \$? = $ac_status" >&5
++  echo "$as_me:7478: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -7088,11 +7486,11 @@
+ done
+ 
+ fi
+-echo "$as_me:7091: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7489: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:7095: error: No curses header-files found" >&5
++	{ { echo "$as_me:7493: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7102,23 +7500,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7105: checking for $ac_header" >&5
++echo "$as_me:7503: 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 7111 "configure"
++#line 7509 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7115: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:7513: \"$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:7121: \$? = $ac_status" >&5
++  echo "$as_me:7519: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7137,7 +7535,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:7140: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:7538: 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 <conftest.$ac_ext <<_ACEOF
+-#line 7196 "configure"
++#line 7594 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7205,16 +7603,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7208: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7606: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7211: \$? = $ac_status" >&5
++  echo "$as_me:7609: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7214: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7612: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7217: \$? = $ac_status" >&5
++  echo "$as_me:7615: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7231,7 +7629,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:7234: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7632: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7250,7 +7648,7 @@
+ 
+ }
+ 
+-echo "$as_me:7253: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:7651: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7262,7 +7660,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7265 "configure"
++#line 7663 "configure"
+ #include "confdefs.h"
+ 
+ #define _XOPEN_SOURCE_EXTENDED
+@@ -7294,16 +7692,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7297: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7695: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7300: \$? = $ac_status" >&5
++  echo "$as_me:7698: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7306: \$? = $ac_status" >&5
++  echo "$as_me:7704: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -7318,14 +7716,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:7321: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:7719: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:7328: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:7726: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7446,7 +7844,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 7449 "configure"
++#line 7847 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7458,16 +7856,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7461: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7859: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7464: \$? = $ac_status" >&5
++  echo "$as_me:7862: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7467: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7470: \$? = $ac_status" >&5
++  echo "$as_me:7868: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7484,7 +7882,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:7487: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7885: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7507,7 +7905,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7510 "configure"
++#line 7908 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -7531,16 +7929,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7534: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7932: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7537: \$? = $ac_status" >&5
++  echo "$as_me:7935: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7938: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7543: \$? = $ac_status" >&5
++  echo "$as_me:7941: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -7561,12 +7959,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7564: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7962: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:7569: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:7967: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
+@@ -7602,7 +8000,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 7605 "configure"
++#line 8003 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7614,16 +8012,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7617: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8015: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7620: \$? = $ac_status" >&5
++  echo "$as_me:8018: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7623: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7626: \$? = $ac_status" >&5
++  echo "$as_me:8024: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7640,7 +8038,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:7643: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8041: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7688,7 +8086,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7691: checking for terminfo header" >&5
++echo "$as_me:8089: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7706,7 +8104,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7709 "configure"
++#line 8107 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7721,16 +8119,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7724: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8122: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7727: \$? = $ac_status" >&5
++  echo "$as_me:8125: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7733: \$? = $ac_status" >&5
++  echo "$as_me:8131: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7746,7 +8144,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7749: result: $cf_cv_term_header" >&5
++echo "$as_me:8147: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7784,7 +8182,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:7787: checking for ncurses version" >&5
++echo "$as_me:8185: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7810,10 +8208,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:7813: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:8211: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7816: \$? = $ac_status" >&5
++  echo "$as_me:8214: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -7823,7 +8221,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7826 "configure"
++#line 8224 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7848,15 +8246,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8249: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7854: \$? = $ac_status" >&5
++  echo "$as_me:8252: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8254: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7859: \$? = $ac_status" >&5
++  echo "$as_me:8257: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7870,7 +8268,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:7873: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:8271: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -7883,7 +8281,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:7886: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:8284: 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
+@@ -7891,7 +8289,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7894 "configure"
++#line 8292 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7910,16 +8308,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7913: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8311: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7916: \$? = $ac_status" >&5
++  echo "$as_me:8314: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7922: \$? = $ac_status" >&5
++  echo "$as_me:8320: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7930,10 +8328,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7933: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:8331: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+-  echo "$as_me:7936: checking for initscr in -lgpm" >&5
++  echo "$as_me:8334: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7941,7 +8339,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7944 "configure"
++#line 8342 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7960,16 +8358,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8361: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7966: \$? = $ac_status" >&5
++  echo "$as_me:8364: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8367: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7972: \$? = $ac_status" >&5
++  echo "$as_me:8370: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -7980,7 +8378,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7983: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:8381: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test $ac_cv_lib_gpm_initscr = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -7995,7 +8393,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:7998: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:8396: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8003,7 +8401,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8006 "configure"
++#line 8404 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8022,16 +8420,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8423: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8028: \$? = $ac_status" >&5
++  echo "$as_me:8426: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8034: \$? = $ac_status" >&5
++  echo "$as_me:8432: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -8042,7 +8440,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8045: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:8443: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -8091,13 +8489,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:8094: checking for initscr" >&5
++	echo "$as_me:8492: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8100 "configure"
++#line 8498 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8128,16 +8526,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8529: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8134: \$? = $ac_status" >&5
++  echo "$as_me:8532: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8137: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8140: \$? = $ac_status" >&5
++  echo "$as_me:8538: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -8147,18 +8545,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8150: result: $ac_cv_func_initscr" >&5
++echo "$as_me:8548: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test $ac_cv_func_initscr = yes; then
+   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:8157: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:8555: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 8161 "configure"
++#line 8559 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8170,25 +8568,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8173: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8571: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8176: \$? = $ac_status" >&5
++  echo "$as_me:8574: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8577: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8182: \$? = $ac_status" >&5
++  echo "$as_me:8580: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:8184: result: yes" >&5
++  echo "$as_me:8582: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:8191: result: no" >&5
++echo "$as_me:8589: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -8256,11 +8654,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:8259: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:8657: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 8263 "configure"
++#line 8661 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8272,25 +8670,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8275: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8673: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8278: \$? = $ac_status" >&5
++  echo "$as_me:8676: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8679: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8284: \$? = $ac_status" >&5
++  echo "$as_me:8682: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:8286: result: yes" >&5
++  echo "$as_me:8684: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:8293: result: no" >&5
++echo "$as_me:8691: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -8305,7 +8703,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:8308: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:8706: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8313,7 +8711,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:8316: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:8714: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -8323,7 +8721,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8326 "configure"
++#line 8724 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8335,23 +8733,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8736: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8341: \$? = $ac_status" >&5
++  echo "$as_me:8739: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8347: \$? = $ac_status" >&5
++  echo "$as_me:8745: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:8349: result: yes" >&5
++  echo "$as_me:8747: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:8354: result: no" >&5
++echo "$as_me:8752: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -8375,25 +8773,36 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:8378: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8776: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:8381: result: yes" >&5
++		echo "$as_me:8779: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:8384: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8782: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
++		cf_save_CFLAGS="$CFLAGS"
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+ 		cf_save_LIBS="$LIBS"
+ 
++		cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
++		cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
++
++		# while -W for passing linker flags is prevalent, it is not "standard".
++		# At least one wrapper for c89/c99 (in Apple's xcode) has its own
++		# incompatible _and_ non-standard -W option which gives an error.  Work
++		# around that pitfall.
++		case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in
++		(x*c[89]9@@*-W*)
++
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root`
++for cf_add_cflags in $cf_pkg_cflags
+ do
+ case $cf_fix_cppflags in
+ (no)
+@@ -8489,7 +8898,195 @@
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++# filter duplicates
++for cf_add_1lib in $cf_add_0lib; do
++	for cf_add_2lib in $cf_add_libs; do
++		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
++			cf_add_1lib=
++			break
++		fi
++	done
++	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
++done
++LIBS="$cf_add_libs"
++
++			cat >conftest.$ac_ext <<_ACEOF
++#line 8915 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++int
++main (void)
++{
++initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:8927: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:8930: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:8933: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8936: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  if test "$cross_compiling" = yes; then
++  cf_test_ncuconfig=maybe
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8942 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++					int main(void)
++					{ char *xx = curses_version(); return (xx == 0); }
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:8949: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:8952: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:8954: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8957: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_test_ncuconfig=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_test_ncuconfig=no
++fi
++rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_test_ncuconfig=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++
++			CFLAGS="$cf_save_CFLAGS"
++			CPPFLAGS="$cf_save_CPPFLAGS"
++			LIBS="$cf_save_LIBS"
++
++			if test "x$cf_test_ncuconfig" != xyes; then
++				cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ 	]*//g'`
++				cf_pkg_cflags="$cf_temp"
++				cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ 	]*//g'`
++				cf_pkg_libs="$cf_temp"
++			fi
++			;;
++		esac
++
++cf_fix_cppflags=no
++cf_new_cflags=
++cf_new_cppflags=
++cf_new_extra_cppflags=
++
++for cf_add_cflags in $cf_pkg_cflags
++do
++case $cf_fix_cppflags in
++(no)
++	case $cf_add_cflags in
++	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
++		case $cf_add_cflags in
++		(-D*)
++			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
++
++			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
++				&& test -z "${cf_tst_cflags}" \
++				&& cf_fix_cppflags=yes
++
++			if test $cf_fix_cppflags = yes ; then
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++				continue
++			elif test "${cf_tst_cflags}" = "\"'" ; then
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++				continue
++			fi
++			;;
++		esac
++		case "$CPPFLAGS" in
++		(*$cf_add_cflags)
++			;;
++		(*)
++			case $cf_add_cflags in
++			(-D*)
++				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
++
++CPPFLAGS=`echo "$CPPFLAGS" | \
++	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
++		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
++
++				;;
++			esac
++
++	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
++	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
++
++			;;
++		esac
++		;;
++	(*)
++
++	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
++	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
++
++		;;
++	esac
++	;;
++(yes)
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
++
++	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
++		&& test -z "${cf_tst_cflags}" \
++		&& cf_fix_cppflags=no
++	;;
++esac
++done
++
++if test -n "$cf_new_cflags" ; then
++
++	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
++	CFLAGS="${CFLAGS}$cf_new_cflags"
++
++fi
++
++if test -n "$cf_new_cppflags" ; then
++
++	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
++	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
++
++fi
++
++if test -n "$cf_new_extra_cppflags" ; then
++
++	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
++	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
++
++fi
++
++cf_add_libs="$LIBS"
++# reverse order
++cf_add_0lib=
++for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -8503,7 +9100,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 8506 "configure"
++#line 9103 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8515,37 +9112,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8518: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9115: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8521: \$? = $ac_status" >&5
++  echo "$as_me:9118: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9121: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8527: \$? = $ac_status" >&5
++  echo "$as_me:9124: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8533 "configure"
++#line 9130 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:8540: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9137: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8543: \$? = $ac_status" >&5
++  echo "$as_me:9140: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:8545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9142: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8548: \$? = $ac_status" >&5
++  echo "$as_me:9145: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -8562,7 +9159,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:8565: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9162: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -8578,7 +9175,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:8581: checking for terminfo header" >&5
++echo "$as_me:9178: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8596,7 +9193,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8599 "configure"
++#line 9196 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8611,16 +9208,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8614: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9211: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8617: \$? = $ac_status" >&5
++  echo "$as_me:9214: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8620: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8623: \$? = $ac_status" >&5
++  echo "$as_me:9220: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8636,7 +9233,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8639: result: $cf_cv_term_header" >&5
++echo "$as_me:9236: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8671,7 +9268,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:8674: result: no" >&5
++		echo "$as_me:9271: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -8687,7 +9284,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:8690: checking for $ac_word" >&5
++echo "$as_me:9287: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8702,7 +9299,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:8705: found $ac_dir/$ac_word" >&5
++echo "$as_me:9302: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8710,10 +9307,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:8713: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9310: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8716: result: no" >&5
++  echo "$as_me:9313: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8726,7 +9323,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:8729: checking for $ac_word" >&5
++echo "$as_me:9326: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8741,7 +9338,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:8744: found $ac_dir/$ac_word" >&5
++echo "$as_me:9341: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8749,10 +9346,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:8752: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9349: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8755: result: no" >&5
++  echo "$as_me:9352: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8881,7 +9478,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:8884: checking if we have identified curses headers" >&5
++echo "$as_me:9481: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8893,7 +9490,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8896 "configure"
++#line 9493 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8905,16 +9502,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8908: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9505: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8911: \$? = $ac_status" >&5
++  echo "$as_me:9508: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8914: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9511: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8917: \$? = $ac_status" >&5
++  echo "$as_me:9514: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8925,11 +9522,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8928: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9525: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:8932: error: No curses header-files found" >&5
++	{ { echo "$as_me:9529: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8939,23 +9536,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8942: checking for $ac_header" >&5
++echo "$as_me:9539: 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 8948 "configure"
++#line 9545 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8952: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:9549: \"$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:8958: \$? = $ac_status" >&5
++  echo "$as_me:9555: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8974,7 +9571,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:8977: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:9574: 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 <conftest.$ac_ext <<_ACEOF
+-#line 9033 "configure"
++#line 9630 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9042,16 +9639,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9045: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9642: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9048: \$? = $ac_status" >&5
++  echo "$as_me:9645: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9051: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9054: \$? = $ac_status" >&5
++  echo "$as_me:9651: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9068,7 +9665,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:9071: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9668: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9087,7 +9684,7 @@
+ 
+ }
+ 
+-echo "$as_me:9090: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9687: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9099,7 +9696,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9102 "configure"
++#line 9699 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9123,16 +9720,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9126: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9723: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9129: \$? = $ac_status" >&5
++  echo "$as_me:9726: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9132: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9729: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9135: \$? = $ac_status" >&5
++  echo "$as_me:9732: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -9147,14 +9744,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:9150: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9747: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:9157: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9754: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9275,7 +9872,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 9278 "configure"
++#line 9875 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9287,16 +9884,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9290: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9887: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9293: \$? = $ac_status" >&5
++  echo "$as_me:9890: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9893: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9299: \$? = $ac_status" >&5
++  echo "$as_me:9896: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9313,7 +9910,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:9316: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9913: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9336,7 +9933,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9339 "configure"
++#line 9936 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9360,16 +9957,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9363: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9960: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9366: \$? = $ac_status" >&5
++  echo "$as_me:9963: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9369: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9966: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9372: \$? = $ac_status" >&5
++  echo "$as_me:9969: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -9390,12 +9987,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9393: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9990: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:9398: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9995: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
+@@ -9431,7 +10028,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 9434 "configure"
++#line 10031 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9443,16 +10040,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10043: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9449: \$? = $ac_status" >&5
++  echo "$as_me:10046: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10049: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9455: \$? = $ac_status" >&5
++  echo "$as_me:10052: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9469,7 +10066,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:9472: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10069: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9517,7 +10114,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9520: checking for terminfo header" >&5
++echo "$as_me:10117: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9535,7 +10132,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9538 "configure"
++#line 10135 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9550,16 +10147,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10150: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9556: \$? = $ac_status" >&5
++  echo "$as_me:10153: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10156: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9562: \$? = $ac_status" >&5
++  echo "$as_me:10159: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9575,7 +10172,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9578: result: $cf_cv_term_header" >&5
++echo "$as_me:10175: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9613,7 +10210,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:9616: checking for ncurses version" >&5
++echo "$as_me:10213: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9639,10 +10236,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:9642: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10239: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9645: \$? = $ac_status" >&5
++  echo "$as_me:10242: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -9652,7 +10249,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9655 "configure"
++#line 10252 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9677,15 +10274,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9680: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10277: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9683: \$? = $ac_status" >&5
++  echo "$as_me:10280: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10282: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9688: \$? = $ac_status" >&5
++  echo "$as_me:10285: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9699,7 +10296,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:9702: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10299: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9712,7 +10309,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9715: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10312: 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
+@@ -9720,7 +10317,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9723 "configure"
++#line 10320 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9739,16 +10336,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9742: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9745: \$? = $ac_status" >&5
++  echo "$as_me:10342: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9748: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9751: \$? = $ac_status" >&5
++  echo "$as_me:10348: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9759,10 +10356,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9762: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10359: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+-  echo "$as_me:9765: checking for initscr in -lgpm" >&5
++  echo "$as_me:10362: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9770,7 +10367,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9773 "configure"
++#line 10370 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9789,16 +10386,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10389: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9795: \$? = $ac_status" >&5
++  echo "$as_me:10392: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9801: \$? = $ac_status" >&5
++  echo "$as_me:10398: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9809,7 +10406,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9812: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10409: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test $ac_cv_lib_gpm_initscr = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -9824,7 +10421,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:9827: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:10424: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9832,7 +10429,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9835 "configure"
++#line 10432 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9851,16 +10448,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9854: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10451: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9857: \$? = $ac_status" >&5
++  echo "$as_me:10454: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9860: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10457: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9863: \$? = $ac_status" >&5
++  echo "$as_me:10460: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9871,7 +10468,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9874: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10471: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -9920,13 +10517,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9923: checking for initscr" >&5
++	echo "$as_me:10520: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9929 "configure"
++#line 10526 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9957,16 +10554,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9960: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10557: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9963: \$? = $ac_status" >&5
++  echo "$as_me:10560: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9966: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10563: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9969: \$? = $ac_status" >&5
++  echo "$as_me:10566: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9976,18 +10573,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9979: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10576: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test $ac_cv_func_initscr = yes; then
+   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:9986: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:10583: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9990 "configure"
++#line 10587 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9999,25 +10596,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10002: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10599: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10005: \$? = $ac_status" >&5
++  echo "$as_me:10602: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10011: \$? = $ac_status" >&5
++  echo "$as_me:10608: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:10013: result: yes" >&5
++  echo "$as_me:10610: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:10020: result: no" >&5
++echo "$as_me:10617: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -10085,11 +10682,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:10088: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:10685: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 10092 "configure"
++#line 10689 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10101,25 +10698,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10104: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10701: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10107: \$? = $ac_status" >&5
++  echo "$as_me:10704: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10110: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10707: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10113: \$? = $ac_status" >&5
++  echo "$as_me:10710: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:10115: result: yes" >&5
++  echo "$as_me:10712: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:10122: result: no" >&5
++echo "$as_me:10719: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -10134,7 +10731,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:10137: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:10734: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10142,7 +10739,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:10145: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:10742: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -10152,7 +10749,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10155 "configure"
++#line 10752 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10164,23 +10761,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10167: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10764: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10170: \$? = $ac_status" >&5
++  echo "$as_me:10767: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10173: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10770: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10176: \$? = $ac_status" >&5
++  echo "$as_me:10773: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:10178: result: yes" >&5
++  echo "$as_me:10775: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:10183: result: no" >&5
++echo "$as_me:10780: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10233,10 +10830,10 @@
+ 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
+ CF_EOF
+ 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
+-		{ (eval echo "$as_me:10236: \"$cf_try\"") >&5
++		{ (eval echo "$as_me:10833: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10239: \$? = $ac_status" >&5
++  echo "$as_me:10836: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 		if test -f conftest.out ; then
+ 			cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ 	][ 	]*//"`
+@@ -10254,10 +10851,10 @@
+ 
+ cf_cv_timestamp=`date`
+ 
+-echo "$as_me:10257: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:10854: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
+ 
+-echo "$as_me:10260: checking if you want to have a library-prefix" >&5
++echo "$as_me:10857: checking if you want to have a library-prefix" >&5
+ echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-lib-prefix or --without-lib-prefix was given.
+@@ -10267,7 +10864,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:10270: result: $with_lib_prefix" >&5
++echo "$as_me:10867: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test $with_lib_prefix = auto
+@@ -10302,7 +10899,7 @@
+ 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+ 
+-echo "$as_me:10305: checking for default loader flags" >&5
++echo "$as_me:10902: checking for default loader flags" >&5
+ echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
+ case $DFT_LWR_MODEL in
+ (normal)  LD_MODEL=''   ;;
+@@ -10310,13 +10907,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:10313: result: $LD_MODEL" >&5
++echo "$as_me:10910: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:10319: checking for an rpath option" >&5
++	echo "$as_me:10916: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case $cf_cv_system_name in
+ 	(irix*)
+@@ -10347,12 +10944,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:10350: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:10947: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:10355: checking if we need a space after rpath option" >&5
++		echo "$as_me:10952: 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"
+ 
+@@ -10373,7 +10970,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 10376 "configure"
++#line 10973 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -10385,16 +10982,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10388: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10985: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10391: \$? = $ac_status" >&5
++  echo "$as_me:10988: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10991: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10397: \$? = $ac_status" >&5
++  echo "$as_me:10994: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_space=no
+ else
+@@ -10404,7 +11001,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:10407: result: $cf_rpath_space" >&5
++		echo "$as_me:11004: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -10426,7 +11023,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:10429: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:11026: 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.
+@@ -10441,9 +11038,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:10444: result: $withval" >&5
++		echo "$as_me:11041: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:10446: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:11043: error: option value must be one of: rel, abi, or auto" >&5
+ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+@@ -10452,7 +11049,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:10455: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:11052: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -10475,14 +11072,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:10478: checking which $CC option to use" >&5
++		echo "$as_me:11075: 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 10485 "configure"
++#line 11082 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10494,16 +11091,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10497: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11094: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10500: \$? = $ac_status" >&5
++  echo "$as_me:11097: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11100: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10506: \$? = $ac_status" >&5
++  echo "$as_me:11103: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -10512,7 +11109,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		done
+-		echo "$as_me:10515: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:11112: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -10583,7 +11180,7 @@
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ 		cf_cv_shlib_version_infix=yes
+-		echo "$as_me:10586: checking if ld -search_paths_first works" >&5
++		echo "$as_me:11183: 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
+@@ -10592,7 +11189,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 10595 "configure"
++#line 11192 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -10604,16 +11201,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10607: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10610: \$? = $ac_status" >&5
++  echo "$as_me:11207: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10613: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10616: \$? = $ac_status" >&5
++  echo "$as_me:11213: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -10624,7 +11221,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:10627: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:11224: 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"
+@@ -10849,7 +11446,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 10852 "configure"
++#line 11449 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10861,16 +11458,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10864: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11461: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10867: \$? = $ac_status" >&5
++  echo "$as_me:11464: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11467: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10873: \$? = $ac_status" >&5
++  echo "$as_me:11470: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -10907,7 +11504,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:10910: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:11507: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -10917,7 +11514,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -10929,18 +11526,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:10932: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:11529: checking if CFLAGS option -$cf_opt works" >&5
+ echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
+-			if { (eval echo "$as_me:10934: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:11531: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10937: \$? = $ac_status" >&5
++  echo "$as_me:11534: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-				echo "$as_me:10939: result: yes" >&5
++				echo "$as_me:11536: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:10943: result: no" >&5
++				echo "$as_me:11540: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -10955,17 +11552,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:10958: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:11555: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:10962: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:11559: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ # The test/sample programs in the original tree link using rpath option.
+ # Make it optional for packagers.
+ if test -n "$LOCAL_LDFLAGS"
+ then
+-	echo "$as_me:10968: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:11565: checking if you want to link sample programs with rpath option" >&5
+ echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-link or --disable-rpath-link was given.
+@@ -10975,7 +11572,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:10978: result: $with_rpath_link" >&5
++	echo "$as_me:11575: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -10988,7 +11585,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10991: checking if you want broken-linker support code" >&5
++echo "$as_me:11588: 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.
+@@ -10998,7 +11595,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:11001: result: $with_broken_linker" >&5
++echo "$as_me:11598: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : ${BROKEN_LINKER:=0}
+@@ -11013,14 +11610,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:11016: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:11613: checking if the POSIX test-macros are already defined" >&5
+ echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+ if test "${cf_cv_posix_visible+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11023 "configure"
++#line 11620 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11039,16 +11636,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11042: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11639: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11045: \$? = $ac_status" >&5
++  echo "$as_me:11642: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11645: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11051: \$? = $ac_status" >&5
++  echo "$as_me:11648: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -11059,7 +11656,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11062: result: $cf_cv_posix_visible" >&5
++echo "$as_me:11659: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -11104,14 +11701,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:11107: checking if this is the GNU C library" >&5
++echo "$as_me:11704: checking if this is the GNU C library" >&5
+ echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11114 "configure"
++#line 11711 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11130,16 +11727,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11133: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11730: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11136: \$? = $ac_status" >&5
++  echo "$as_me:11733: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11139: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11736: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11142: \$? = $ac_status" >&5
++  echo "$as_me:11739: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -11150,7 +11747,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11153: result: $cf_cv_gnu_library" >&5
++echo "$as_me:11750: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -11158,7 +11755,7 @@
+ 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+ 	# was changed to help a little.  newlib incorporated the change about 4
+ 	# years later.
+-	echo "$as_me:11161: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:11758: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+ echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11170,7 +11767,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 11173 "configure"
++#line 11770 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11189,16 +11786,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11192: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11789: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11195: \$? = $ac_status" >&5
++  echo "$as_me:11792: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11198: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11201: \$? = $ac_status" >&5
++  echo "$as_me:11798: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -11210,12 +11807,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:11213: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:11810: result: $cf_cv_gnu_library_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+ 
+ 	if test "x$cf_cv_gnu_library_219" = xyes; then
+ 		cf_save="$CPPFLAGS"
+-		echo "$as_me:11218: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:11815: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11320,7 +11917,7 @@
+ fi
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 11323 "configure"
++#line 11920 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -11340,16 +11937,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11343: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11940: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11346: \$? = $ac_status" >&5
++  echo "$as_me:11943: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11946: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11352: \$? = $ac_status" >&5
++  echo "$as_me:11949: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -11360,7 +11957,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11363: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11960: result: $cf_cv_gnu_dftsrc_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+ 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+ 	else
+@@ -11369,14 +11966,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:11372: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:11969: 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 11379 "configure"
++#line 11976 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11391,16 +11988,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11394: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11991: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11397: \$? = $ac_status" >&5
++  echo "$as_me:11994: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11997: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11403: \$? = $ac_status" >&5
++  echo "$as_me:12000: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11507,7 +12104,7 @@
+ fi
+ 
+ 			 cat >conftest.$ac_ext <<_ACEOF
+-#line 11510 "configure"
++#line 12107 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11522,16 +12119,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11525: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12122: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11528: \$? = $ac_status" >&5
++  echo "$as_me:12125: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11531: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11534: \$? = $ac_status" >&5
++  echo "$as_me:12131: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11546,12 +12143,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11549: result: $cf_cv_gnu_source" >&5
++echo "$as_me:12146: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ 
+ 		if test "$cf_cv_gnu_source" = yes
+ 		then
+-		echo "$as_me:11554: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:12151: checking if we should also define _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_default_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11561,7 +12158,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 11564 "configure"
++#line 12161 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11576,16 +12173,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11579: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12176: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11582: \$? = $ac_status" >&5
++  echo "$as_me:12179: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11585: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11588: \$? = $ac_status" >&5
++  echo "$as_me:12185: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11596,7 +12193,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11599: result: $cf_cv_default_source" >&5
++echo "$as_me:12196: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11633,16 +12230,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11636: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:12233: 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}:11642: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:12239: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11645 "configure"
++#line 12242 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11657,16 +12254,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11660: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12257: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11663: \$? = $ac_status" >&5
++  echo "$as_me:12260: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11666: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12263: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11669: \$? = $ac_status" >&5
++  echo "$as_me:12266: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11687,7 +12284,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 11690 "configure"
++#line 12287 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11702,16 +12299,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11705: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12302: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11708: \$? = $ac_status" >&5
++  echo "$as_me:12305: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11714: \$? = $ac_status" >&5
++  echo "$as_me:12311: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -11722,7 +12319,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:11725: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12322: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11730,10 +12327,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11733: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:12330: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 11736 "configure"
++#line 12333 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11748,16 +12345,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12348: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11754: \$? = $ac_status" >&5
++  echo "$as_me:12351: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11760: \$? = $ac_status" >&5
++  echo "$as_me:12357: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -11773,7 +12370,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11776: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:12373: 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
+@@ -11913,14 +12510,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11916: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12513: 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 11923 "configure"
++#line 12520 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11939,16 +12536,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11942: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12539: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11945: \$? = $ac_status" >&5
++  echo "$as_me:12542: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11948: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12545: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11951: \$? = $ac_status" >&5
++  echo "$as_me:12548: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11960,7 +12557,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 11963 "configure"
++#line 12560 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11979,16 +12576,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11982: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11985: \$? = $ac_status" >&5
++  echo "$as_me:12582: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11988: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11991: \$? = $ac_status" >&5
++  echo "$as_me:12588: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12003,7 +12600,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12006: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12603: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12133,16 +12730,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:12136: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:12733: 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}:12142: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:12739: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 12145 "configure"
++#line 12742 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12157,16 +12754,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12160: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12757: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12163: \$? = $ac_status" >&5
++  echo "$as_me:12760: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12166: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12763: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12169: \$? = $ac_status" >&5
++  echo "$as_me:12766: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -12187,7 +12784,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 12190 "configure"
++#line 12787 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12202,16 +12799,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12802: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12208: \$? = $ac_status" >&5
++  echo "$as_me:12805: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12808: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12214: \$? = $ac_status" >&5
++  echo "$as_me:12811: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12222,7 +12819,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:12225: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12822: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -12230,10 +12827,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:12233: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:12830: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 12236 "configure"
++#line 12833 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12248,16 +12845,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12251: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12848: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12254: \$? = $ac_status" >&5
++  echo "$as_me:12851: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12257: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12260: \$? = $ac_status" >&5
++  echo "$as_me:12857: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12273,7 +12870,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12276: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:12873: 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
+@@ -12467,7 +13064,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12470: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:13067: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12477,7 +13074,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12480: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:13077: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12487,7 +13084,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12490: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:13087: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -12497,10 +13094,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12500: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:13097: checking if _XOPEN_SOURCE really is set" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 12503 "configure"
++#line 13100 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12515,16 +13112,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12518: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13115: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12521: \$? = $ac_status" >&5
++  echo "$as_me:13118: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13121: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12527: \$? = $ac_status" >&5
++  echo "$as_me:13124: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12533,12 +13130,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:12536: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:13133: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
+ 	if test $cf_XOPEN_SOURCE_set = yes
+ 	then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 12541 "configure"
++#line 13138 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12553,16 +13150,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12556: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13153: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12559: \$? = $ac_status" >&5
++  echo "$as_me:13156: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12562: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13159: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12565: \$? = $ac_status" >&5
++  echo "$as_me:13162: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12573,19 +13170,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		if test $cf_XOPEN_SOURCE_set_ok = no
+ 		then
+-			{ echo "$as_me:12576: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:13173: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12581: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13178: 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 12588 "configure"
++#line 13185 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12604,16 +13201,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12607: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13204: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12610: \$? = $ac_status" >&5
++  echo "$as_me:13207: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12613: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12616: \$? = $ac_status" >&5
++  echo "$as_me:13213: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12625,7 +13222,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 12628 "configure"
++#line 13225 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12644,16 +13241,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12647: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13244: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12650: \$? = $ac_status" >&5
++  echo "$as_me:13247: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12653: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13250: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12656: \$? = $ac_status" >&5
++  echo "$as_me:13253: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12668,7 +13265,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12671: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13268: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12794,7 +13391,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:12797: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:13394: 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
+@@ -12806,7 +13403,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 12809 "configure"
++#line 13406 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12826,16 +13423,16 @@
+ }
+ _ACEOF
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12829: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13426: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12832: \$? = $ac_status" >&5
++  echo "$as_me:13429: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12835: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13432: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12838: \$? = $ac_status" >&5
++  echo "$as_me:13435: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12845,16 +13442,16 @@
+ rm -f conftest.$ac_objext
+      	 CC="$CC -n32"
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13445: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12851: \$? = $ac_status" >&5
++  echo "$as_me:13448: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13451: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12857: \$? = $ac_status" >&5
++  echo "$as_me:13454: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -12868,13 +13465,13 @@
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-echo "$as_me:12871: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:13468: 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:12877: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:13474: 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
+@@ -12882,7 +13479,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12885 "configure"
++#line 13482 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12902,16 +13499,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12905: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13502: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12908: \$? = $ac_status" >&5
++  echo "$as_me:13505: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13508: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12914: \$? = $ac_status" >&5
++  echo "$as_me:13511: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12920,7 +13517,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12923 "configure"
++#line 13520 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -12941,16 +13538,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12944: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13541: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12947: \$? = $ac_status" >&5
++  echo "$as_me:13544: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12950: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13547: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12953: \$? = $ac_status" >&5
++  echo "$as_me:13550: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -12961,7 +13558,7 @@
+   break
+ done
+ fi
+-echo "$as_me:12964: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:13561: 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
+ 
+@@ -12971,7 +13568,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:12974: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:13571: 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
+@@ -12979,7 +13576,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12982 "configure"
++#line 13579 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12999,16 +13596,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13002: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13599: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13005: \$? = $ac_status" >&5
++  echo "$as_me:13602: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13011: \$? = $ac_status" >&5
++  echo "$as_me:13608: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -13017,7 +13614,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13020 "configure"
++#line 13617 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -13038,16 +13635,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13041: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13638: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13044: \$? = $ac_status" >&5
++  echo "$as_me:13641: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13644: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13050: \$? = $ac_status" >&5
++  echo "$as_me:13647: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -13058,7 +13655,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13061: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:13658: 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
+ 
+@@ -13071,7 +13668,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:13074: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:13671: 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
+@@ -13079,7 +13676,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13082 "configure"
++#line 13679 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13091,16 +13688,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13094: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13691: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13097: \$? = $ac_status" >&5
++  echo "$as_me:13694: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13103: \$? = $ac_status" >&5
++  echo "$as_me:13700: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -13109,7 +13706,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13112 "configure"
++#line 13709 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -13122,16 +13719,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13125: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13722: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13128: \$? = $ac_status" >&5
++  echo "$as_me:13725: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13134: \$? = $ac_status" >&5
++  echo "$as_me:13731: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -13142,7 +13739,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13145: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:13742: 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
+ 
+@@ -13156,13 +13753,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:13159: checking for fseeko" >&5
++echo "$as_me:13756: 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 13165 "configure"
++#line 13762 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13174,16 +13771,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13177: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13774: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13180: \$? = $ac_status" >&5
++  echo "$as_me:13777: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13183: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13186: \$? = $ac_status" >&5
++  echo "$as_me:13783: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -13193,7 +13790,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13196: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:13793: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -13232,14 +13829,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:13235: checking whether to use struct dirent64" >&5
++	echo "$as_me:13832: 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 13242 "configure"
++#line 13839 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -13261,16 +13858,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13264: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13267: \$? = $ac_status" >&5
++  echo "$as_me:13864: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13273: \$? = $ac_status" >&5
++  echo "$as_me:13870: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -13281,7 +13878,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13284: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13881: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13291,7 +13888,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:13294: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:13891: 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.
+@@ -13301,7 +13898,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:13304: result: $with_rcs_ids" >&5
++echo "$as_me:13901: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13311,7 +13908,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:13314: checking if you want to build with function extensions" >&5
++echo "$as_me:13911: 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.
+@@ -13321,7 +13918,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:13324: result: $with_ext_funcs" >&5
++echo "$as_me:13921: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -13339,7 +13936,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:13342: checking for extended use of const keyword" >&5
++echo "$as_me:13939: 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.
+@@ -13349,7 +13946,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:13352: result: $with_ext_const" >&5
++echo "$as_me:13949: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -13359,7 +13956,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:13362: checking if you want all development code" >&5
++echo "$as_me:13959: 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.
+@@ -13369,7 +13966,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:13372: result: $with_develop" >&5
++echo "$as_me:13969: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -13378,7 +13975,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:13381: checking if you want to link with the pthread library" >&5
++echo "$as_me:13978: 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.
+@@ -13388,27 +13985,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:13391: result: $with_pthread" >&5
++echo "$as_me:13988: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:13395: checking for pthread.h" >&5
++	echo "$as_me:13992: 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 13401 "configure"
++#line 13998 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:13405: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14002: \"$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:13411: \$? = $ac_status" >&5
++  echo "$as_me:14008: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13427,7 +14024,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13430: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:14027: 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
+ 
+@@ -13437,7 +14034,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:13440: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:14037: checking if we can link with the $cf_lib_pthread library" >&5
+ echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
+ 	    cf_save_LIBS="$LIBS"
+ 
+@@ -13458,7 +14055,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+-#line 13461 "configure"
++#line 14058 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13475,16 +14072,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13478: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14075: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13481: \$? = $ac_status" >&5
++  echo "$as_me:14078: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13484: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14081: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13487: \$? = $ac_status" >&5
++  echo "$as_me:14084: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_pthread=yes
+ else
+@@ -13494,7 +14091,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:13497: result: $with_pthread" >&5
++	    echo "$as_me:14094: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -13522,7 +14119,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:13525: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:14122: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -13531,7 +14128,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13534: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:14131: 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.
+@@ -13541,18 +14138,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:13544: result: $use_weak_symbols" >&5
++echo "$as_me:14141: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:13548: checking if $CC supports weak symbols" >&5
++echo "$as_me:14145: 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 13555 "configure"
++#line 14152 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13578,16 +14175,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13581: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14178: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13584: \$? = $ac_status" >&5
++  echo "$as_me:14181: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13587: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13590: \$? = $ac_status" >&5
++  echo "$as_me:14187: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -13598,7 +14195,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13601: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:14198: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -13627,13 +14224,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:13630: checking for _nc_TABSIZE" >&5
++echo "$as_me:14227: checking for _nc_TABSIZE" >&5
+ echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13636 "configure"
++#line 14233 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13664,16 +14261,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13667: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14264: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13670: \$? = $ac_status" >&5
++  echo "$as_me:14267: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13673: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14270: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13676: \$? = $ac_status" >&5
++  echo "$as_me:14273: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -13683,7 +14280,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13686: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:14283: result: $ac_cv_func__nc_TABSIZE" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
+ if test $ac_cv_func__nc_TABSIZE = yes; then
+   assume_reentrant=yes
+@@ -13695,7 +14292,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:13698: checking if you want experimental reentrant code" >&5
++echo "$as_me:14295: 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.
+@@ -13705,7 +14302,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:13708: result: $with_reentrant" >&5
++echo "$as_me:14305: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -13728,7 +14325,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:13731: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:14328: checking for prefix used to wrap public variables" >&5
+ echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
+ 
+ # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
+@@ -13738,7 +14335,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:13741: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:14338: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -13752,7 +14349,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:13755: checking if you want to see long compiling messages" >&5
++echo "$as_me:14352: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -13786,11 +14383,11 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:13789: result: $enableval" >&5
++echo "$as_me:14386: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:13793: checking if you want to see compiler warnings" >&5
++echo "$as_me:14390: 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.
+@@ -13798,7 +14395,7 @@
+   enableval="$enable_warnings"
+   with_warnings=$enableval
+ fi;
+-echo "$as_me:13801: result: $with_warnings" >&5
++echo "$as_me:14398: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ 
+ if test "x$with_warnings" = "xyes"; then
+@@ -13824,7 +14421,7 @@
+ done
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13827 "configure"
++#line 14424 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13839,26 +14436,26 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13842: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14439: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13845: \$? = $ac_status" >&5
++  echo "$as_me:14442: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13851: \$? = $ac_status" >&5
++  echo "$as_me:14448: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-echo "$as_me:13854: checking for X11/Xt const-feature" >&5
++echo "$as_me:14451: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 13861 "configure"
++#line 14458 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -13875,16 +14472,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14475: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13881: \$? = $ac_status" >&5
++  echo "$as_me:14478: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14481: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13887: \$? = $ac_status" >&5
++  echo "$as_me:14484: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -13899,7 +14496,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13902: result: $cf_cv_const_x_string" >&5
++echo "$as_me:14499: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -13928,7 +14525,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+  fi
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:14544: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -13960,12 +14557,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:13963: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:14560: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13966: \$? = $ac_status" >&5
++  echo "$as_me:14563: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:13968: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:14565: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -13973,7 +14570,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:13976: checking for $CC warning options..." >&5
++	{ echo "$as_me:14573: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -13997,12 +14594,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:14000: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:14597: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14003: \$? = $ac_status" >&5
++  echo "$as_me:14600: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:14005: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:14602: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Winline)
+@@ -14010,7 +14607,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:14013: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:14610: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -14020,7 +14617,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:14023: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:14620: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -14053,10 +14650,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:14056: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:14653: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:14705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14111: \$? = $ac_status" >&5
++  echo "$as_me:14708: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:14113: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:14710: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -14170,7 +14767,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:14173: checking if you want to enable runtime assertions" >&5
++echo "$as_me:14770: 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.
+@@ -14180,7 +14777,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:14183: result: $with_assertions" >&5
++echo "$as_me:14780: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -14233,7 +14830,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14236: checking whether to add trace feature to all models" >&5
++echo "$as_me:14833: 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.
+@@ -14243,7 +14840,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:14246: result: $cf_with_trace" >&5
++echo "$as_me:14843: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -14351,7 +14948,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:14354: checking if we want to use GNAT projects" >&5
++echo "$as_me:14951: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -14368,7 +14965,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:14371: result: $enable_gnat_projects" >&5
++echo "$as_me:14968: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -14376,13 +14973,13 @@
+ (*mingw32*)
+ 	;;
+ (*)
+-echo "$as_me:14379: checking for gettimeofday" >&5
++echo "$as_me:14976: 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 14385 "configure"
++#line 14982 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14413,16 +15010,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14416: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15013: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14419: \$? = $ac_status" >&5
++  echo "$as_me:15016: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14422: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15019: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14425: \$? = $ac_status" >&5
++  echo "$as_me:15022: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -14432,7 +15029,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14435: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:15032: 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
+@@ -14441,7 +15038,7 @@
+ 
+ else
+ 
+-echo "$as_me:14444: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:15041: 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
+@@ -14449,7 +15046,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14452 "configure"
++#line 15049 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14468,16 +15065,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14471: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15068: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14474: \$? = $ac_status" >&5
++  echo "$as_me:15071: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14477: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14480: \$? = $ac_status" >&5
++  echo "$as_me:15077: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -14488,7 +15085,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14491: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:15088: 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
+ 
+@@ -14504,13 +15101,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:14507: checking for ANSI C header files" >&5
++echo "$as_me:15104: 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 14513 "configure"
++#line 15110 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14518,13 +15115,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14521: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15118: \"$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:14527: \$? = $ac_status" >&5
++  echo "$as_me:15124: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14546,7 +15143,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 14549 "configure"
++#line 15146 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14564,7 +15161,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 14567 "configure"
++#line 15164 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14585,7 +15182,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14588 "configure"
++#line 15185 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14611,15 +15208,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:14614: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15211: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14617: \$? = $ac_status" >&5
++  echo "$as_me:15214: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:14619: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15216: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14622: \$? = $ac_status" >&5
++  echo "$as_me:15219: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -14632,7 +15229,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14635: result: $ac_cv_header_stdc" >&5
++echo "$as_me:15232: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14648,28 +15245,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14651: checking for $ac_header" >&5
++echo "$as_me:15248: 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 14657 "configure"
++#line 15254 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15260: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14666: \$? = $ac_status" >&5
++  echo "$as_me:15263: \$? = $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:15266: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14672: \$? = $ac_status" >&5
++  echo "$as_me:15269: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14679,7 +15276,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:14682: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15279: 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 <&5
++echo "$as_me:15289: 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 14698 "configure"
++#line 15295 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14710,16 +15307,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14713: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15310: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14716: \$? = $ac_status" >&5
++  echo "$as_me:15313: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14719: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15316: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14722: \$? = $ac_status" >&5
++  echo "$as_me:15319: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -14729,10 +15326,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:14732: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15329: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:14735: checking size of signed char" >&5
++echo "$as_me:15332: 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
+@@ -14741,7 +15338,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14744 "configure"
++#line 15341 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14753,21 +15350,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14756: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15353: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14759: \$? = $ac_status" >&5
++  echo "$as_me:15356: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14765: \$? = $ac_status" >&5
++  echo "$as_me:15362: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 14770 "configure"
++#line 15367 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14779,16 +15376,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14782: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15379: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14785: \$? = $ac_status" >&5
++  echo "$as_me:15382: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14791: \$? = $ac_status" >&5
++  echo "$as_me:15388: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -14804,7 +15401,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 14807 "configure"
++#line 15404 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14816,16 +15413,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14819: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15416: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14822: \$? = $ac_status" >&5
++  echo "$as_me:15419: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14825: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15422: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14828: \$? = $ac_status" >&5
++  echo "$as_me:15425: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -14841,7 +15438,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 14844 "configure"
++#line 15441 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14853,16 +15450,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14856: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15453: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14859: \$? = $ac_status" >&5
++  echo "$as_me:15456: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15459: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14865: \$? = $ac_status" >&5
++  echo "$as_me:15462: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -14875,12 +15472,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:14878: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15475: 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 14883 "configure"
++#line 15480 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14896,15 +15493,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:14899: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15496: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14902: \$? = $ac_status" >&5
++  echo "$as_me:15499: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:14904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14907: \$? = $ac_status" >&5
++  echo "$as_me:15504: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -14920,19 +15517,19 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:14923: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15520: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15526: 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 14935 "configure"
++#line 15532 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14940,13 +15537,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14943: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15540: \"$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:14949: \$? = $ac_status" >&5
++  echo "$as_me:15546: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14968,7 +15565,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 14971 "configure"
++#line 15568 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14986,7 +15583,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 14989 "configure"
++#line 15586 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15007,7 +15604,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15010 "configure"
++#line 15607 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -15033,15 +15630,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15036: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15633: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15039: \$? = $ac_status" >&5
++  echo "$as_me:15636: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15044: \$? = $ac_status" >&5
++  echo "$as_me:15641: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -15054,7 +15651,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:15057: result: $ac_cv_header_stdc" >&5
++echo "$as_me:15654: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -15067,13 +15664,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:15070: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:15667: 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 15076 "configure"
++#line 15673 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -15088,16 +15685,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15091: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15688: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15094: \$? = $ac_status" >&5
++  echo "$as_me:15691: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15097: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15694: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15100: \$? = $ac_status" >&5
++  echo "$as_me:15697: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -15107,7 +15704,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15110: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15707: 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 <&5
++  echo "$as_me:15720: 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
+@@ -15128,7 +15725,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15131 "configure"
++#line 15728 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15147,16 +15744,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15150: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15747: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15153: \$? = $ac_status" >&5
++  echo "$as_me:15750: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15156: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15159: \$? = $ac_status" >&5
++  echo "$as_me:15756: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -15167,14 +15764,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15170: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:15767: 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:15177: checking for opendir in -lx" >&5
++  echo "$as_me:15774: 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
+@@ -15182,7 +15779,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15185 "configure"
++#line 15782 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15201,16 +15798,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15801: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15207: \$? = $ac_status" >&5
++  echo "$as_me:15804: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15210: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15213: \$? = $ac_status" >&5
++  echo "$as_me:15810: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -15221,7 +15818,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15224: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:15821: 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"
+@@ -15229,13 +15826,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15232: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:15829: 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 15238 "configure"
++#line 15835 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -15251,16 +15848,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15254: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15851: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15257: \$? = $ac_status" >&5
++  echo "$as_me:15854: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15263: \$? = $ac_status" >&5
++  echo "$as_me:15860: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -15270,7 +15867,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15273: result: $ac_cv_header_time" >&5
++echo "$as_me:15870: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -15288,13 +15885,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:15291: checking for an ANSI C-conforming const" >&5
++echo "$as_me:15888: 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 15297 "configure"
++#line 15894 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15352,16 +15949,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15952: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15358: \$? = $ac_status" >&5
++  echo "$as_me:15955: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15958: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15364: \$? = $ac_status" >&5
++  echo "$as_me:15961: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -15371,7 +15968,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15374: result: $ac_cv_c_const" >&5
++echo "$as_me:15971: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -15383,7 +15980,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:15386: checking if data-only library module links" >&5
++echo "$as_me:15983: 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
+@@ -15391,20 +15988,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:15994: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15400: \$? = $ac_status" >&5
++  echo "$as_me:15997: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:16017: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15423: \$? = $ac_status" >&5
++  echo "$as_me:16020: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -15433,7 +16030,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15436 "configure"
++#line 16033 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -15444,15 +16041,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15450: \$? = $ac_status" >&5
++  echo "$as_me:16047: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16049: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15455: \$? = $ac_status" >&5
++  echo "$as_me:16052: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -15467,7 +16064,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15470: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:16067: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -15486,23 +16083,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15489: checking for $ac_header" >&5
++echo "$as_me:16086: 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 15495 "configure"
++#line 16092 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15499: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16096: \"$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:15505: \$? = $ac_status" >&5
++  echo "$as_me:16102: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15521,7 +16118,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15524: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:16121: 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 <&5
++echo "$as_me:16131: 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
+@@ -15542,7 +16139,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15545 "configure"
++#line 16142 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15583,15 +16180,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15586: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16183: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15589: \$? = $ac_status" >&5
++  echo "$as_me:16186: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16188: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15594: \$? = $ac_status" >&5
++  echo "$as_me:16191: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -15606,16 +16203,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:15609: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:16206: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:15612: checking for mkstemp" >&5
++	echo "$as_me:16209: 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 15618 "configure"
++#line 16215 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15646,16 +16243,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15649: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16246: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15652: \$? = $ac_status" >&5
++  echo "$as_me:16249: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16252: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15658: \$? = $ac_status" >&5
++  echo "$as_me:16255: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -15665,7 +16262,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15668: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:16265: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -15694,7 +16291,7 @@
+ 	unset cf_TEMP_gnat
+ 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:15697: checking for $ac_word" >&5
++echo "$as_me:16294: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15711,7 +16308,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+-   echo "$as_me:15714: found $ac_dir/$ac_word" >&5
++   echo "$as_me:16311: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -15723,10 +16320,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:15726: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:16323: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:15729: result: no" >&5
++  echo "$as_me:16326: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -15736,7 +16333,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:15739: checking for $cf_prog_gnat version" >&5
++echo "$as_me:16336: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15747,7 +16344,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:15750: result: $cf_cv_gnat_version" >&5
++echo "$as_me:16347: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -15776,7 +16373,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:15779: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:16376: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test $cf_gprconfig = C
+ 				then
+@@ -15795,10 +16392,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
+-					echo "$as_me:15798: result: $cf_gprconfig_value" >&5
++					echo "$as_me:16395: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:15801: result: missing" >&5
++					echo "$as_me:16398: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -15811,7 +16408,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:15814: checking for gnat version" >&5
++echo "$as_me:16411: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15822,7 +16419,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:15825: result: $cf_cv_gnat_version" >&5
++echo "$as_me:16422: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ 
+@@ -15831,7 +16428,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:15834: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:16431: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -15839,7 +16436,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:15842: checking for $ac_word" >&5
++echo "$as_me:16439: 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
+@@ -15854,7 +16451,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:15857: found $ac_dir/$ac_word" >&5
++echo "$as_me:16454: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -15863,20 +16460,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:15866: result: $M4_exists" >&5
++  echo "$as_me:16463: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:15869: result: no" >&5
++  echo "$as_me:16466: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$ac_cv_prog_M4_exists" = no; then
+ 			cf_cv_prog_gnat_correct=no
+-			{ echo "$as_me:15875: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:16472: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ 		fi
+ 		if test "$cf_cv_prog_gnat_correct" = yes; then
+-			echo "$as_me:15879: checking if GNAT works" >&5
++			echo "$as_me:16476: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf conftest* *~conftest*
+@@ -15904,7 +16501,7 @@
+ fi
+ rm -rf conftest* *~conftest*
+ 
+-			echo "$as_me:15907: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:16504: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -15914,7 +16511,7 @@
+ 
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:15917: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:16514: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -15931,10 +16528,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:15934: result: $ADAFLAGS" >&5
++	echo "$as_me:16531: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:15937: checking if GNATPREP supports -T option" >&5
++echo "$as_me:16534: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15944,11 +16541,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:15947: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:16544: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:15951: checking if GNAT supports generics" >&5
++echo "$as_me:16548: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case $cf_cv_gnat_version in
+ (3.[1-9]*|[4-9].*)
+@@ -15958,7 +16555,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:15961: result: $cf_gnat_generics" >&5
++echo "$as_me:16558: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -15970,7 +16567,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:15973: checking if GNAT supports SIGINT" >&5
++echo "$as_me:16570: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16018,7 +16615,7 @@
+ rm -rf conftest* *~conftest*
+ 
+ fi
+-echo "$as_me:16021: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:16618: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -16031,7 +16628,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:16034: checking if GNAT supports project files" >&5
++echo "$as_me:16631: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case $cf_cv_gnat_version in
+ (3.[0-9]*)
+@@ -16094,15 +16691,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:16097: result: $cf_gnat_projects" >&5
++echo "$as_me:16694: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test $cf_gnat_projects = yes
+ then
+-	echo "$as_me:16103: checking if GNAT supports libraries" >&5
++	echo "$as_me:16700: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:16105: result: $cf_gnat_libraries" >&5
++	echo "$as_me:16702: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -16122,7 +16719,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:16125: checking for ada-compiler" >&5
++echo "$as_me:16722: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -16133,12 +16730,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:16136: result: $cf_ada_compiler" >&5
++echo "$as_me:16733: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:16141: checking for ada-include" >&5
++echo "$as_me:16738: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -16174,7 +16771,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:16177: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:16774: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -16183,10 +16780,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:16186: result: $ADA_INCLUDE" >&5
++echo "$as_me:16783: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:16189: checking for ada-objects" >&5
++echo "$as_me:16786: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -16222,7 +16819,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:16225: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:16822: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -16231,10 +16828,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:16234: result: $ADA_OBJECTS" >&5
++echo "$as_me:16831: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:16237: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:16834: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -16244,14 +16841,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:16247: result: $with_ada_sharedlib" >&5
++echo "$as_me:16844: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:16254: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:16851: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -16271,7 +16868,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:16274: checking for ada-libname" >&5
++echo "$as_me:16871: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -16287,16 +16884,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16290: result: $ADA_LIBNAME" >&5
++echo "$as_me:16887: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:16294: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:16891: error: No usable Ada compiler found" >&5
+ echo "$as_me: error: No usable Ada compiler found" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ else
+-	{ { echo "$as_me:16299: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:16896: error: The Ada compiler is needed for this package" >&5
+ echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -16336,7 +16933,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:16339: checking default library suffix" >&5
++echo "$as_me:16936: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -16347,10 +16944,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:16350: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:16947: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:16353: checking default library-dependency suffix" >&5
++echo "$as_me:16950: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -16408,10 +17005,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:16411: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:17008: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:16414: checking default object directory" >&5
++echo "$as_me:17011: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -16427,7 +17024,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:16430: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:17027: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -16669,7 +17266,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:16672: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:17269: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -16845,7 +17442,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:16848: error: ambiguous option: $1
++    { { echo "$as_me:17445: 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;}
+@@ -16864,7 +17461,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:16867: error: unrecognized option: $1
++  -*) { { echo "$as_me:17464: 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;}
+@@ -16936,7 +17533,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:16939: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:17536: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -17288,7 +17885,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:17291: creating $ac_file" >&5
++    { echo "$as_me:17888: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -17306,7 +17903,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:17309: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:17906: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -17319,7 +17916,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:17322: error: cannot find input file: $f" >&5
++           { { echo "$as_me:17919: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -17335,7 +17932,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:17338: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:17935: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -17344,7 +17941,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:17347: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:17944: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -17381,7 +17978,7 @@
+             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:17384: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:17981: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -17392,7 +17989,7 @@
+     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:17395: WARNING: Some variables may not be substituted:
++      { echo "$as_me:17992: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -17441,7 +18038,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:17444: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:18041: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -17452,7 +18049,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:17455: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:18052: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -17465,7 +18062,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:17468: error: cannot find input file: $f" >&5
++           { { echo "$as_me:18065: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -17523,7 +18120,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:17526: $ac_file is unchanged" >&5
++      { echo "$as_me:18123: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: NEWS
+Prereq:  1.3453 
+--- ncurses-6.2-20200222+/NEWS	2020-02-23 01:08:47.000000000 +0000
++++ ncurses-6.2-20200229/NEWS	2020-02-29 23:15:52.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3453 2020/02/23 01:08:47 tom Exp $
++-- $Id: NEWS,v 1.3455 2020/02/29 23:15:52 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,24 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20200229
++	+ modify CF_NCURSES_CONFIG to work around xcode's c99 "-W" option,
++	  which conflicts with conventional use for passing linker options.
++	> fixes for building with Visual Studio C++ and msys2 (patches by
++	  "Maarten Anonymous"):
++	+ check for pcre2posix.h instead of pcre2-posix.h
++	+ add case in CF_SHARED_OPTS for msys2 + msvc
++	+ add fallback definition for STDIN_FILENO in progs.priv.h
++	+ modify win_driver.c to use _alloca() rather than gcc's variable
++	  length array feature.
++	+ add NCURSES_IMPEXP to ncurses wrapped-variable declarations
++	+ remove NCURSES_IMPEXP from class variables in c++/cursslk.h
++	+ remove fallback prototype for exit() from c++/etip.h.in
++	+ use configured check for  in a couple of places
++	+ conditionally include winsock.h in ncurses/win32con/gettimeofday.c,
++	  because Visual Studio needs this for the timestruct declaration.
++	+ adjust syntax in a couple of files using the NCURSES_API symbol.
++
+ 20200222
+ 	+ expanded note in ncurses.3x regarding automatically-included headers
+ 	+ improve vt50h and vt52 based on DECScope manual -TD
+Index: VERSION
+--- ncurses-6.2-20200222+/VERSION	2020-02-22 13:49:45.000000000 +0000
++++ ncurses-6.2-20200229/VERSION	2020-02-29 12:43:09.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.2	20200222
++5:0:10	6.2	20200229
+Index: aclocal.m4
+Prereq:  1.896 
+--- ncurses-6.2-20200222+/aclocal.m4	2020-02-08 21:01:07.000000000 +0000
++++ ncurses-6.2-20200229/aclocal.m4	2020-02-29 21:30:04.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.896 2020/02/08 21:01:07 tom Exp $
++dnl $Id: aclocal.m4,v 1.897 2020/02/29 21:30:04 anonymous.maarten Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -6533,7 +6533,7 @@
+ done
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SHARED_OPTS version: 93 updated: 2018/08/18 16:36:35
++dnl CF_SHARED_OPTS version: 94 updated: 2020/02/29 16:09:19
+ dnl --------------
+ dnl --------------
+ dnl Attempt to determine the appropriate CC/LD options for creating a shared
+@@ -6759,6 +6759,37 @@
+ 		CF_SHARED_SONAME
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+ 		;;
++	(mingw*msvc*)
++		cf_cv_shlib_version=mingw
++		cf_cv_shlib_version_infix=mingw
++		shlibdir=$bindir
++		MAKE_DLLS=
++		if test "$DFT_LWR_MODEL" = "shared" ; then
++			LOCAL_LDFLAGS="-link -dll"
++			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
++			EXTRA_LDFLAGS="-link -dll $EXTRA_LDFLAGS"
++		fi
++		CC_SHARED_OPTS=
++		MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh $@ ${LD} ${CFLAGS}'
++		RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
++		cat >mk_shared_lib.sh <<-CF_EOF
++		#!$SHELL
++		SHARED_LIB=\$1
++		IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$\.dll.a/'\`
++		shift
++		my_ld=\$1
++		shift
++		cat <<-EOF
++		Linking shared library
++		** SHARED LIB \$SHARED_LIB
++		** IMPORT_LIB \$IMPORT_LIB
++EOF
++		args=\$(echo \$* | sed -E "s#-l(\w*)#lib\1.a#g" | sed -E "s#-L(\w*)#-LIBPATH:\1#g")
++		exec \$my_ld -DLL -IMPLIB:"\${IMPORT_LIB}" -OUT:"\${SHARED_LIB}" ${LDFLAGS} \$args
++		mv "\${IMPORT_LIB}" "\${IMPORT_LIB}"
++CF_EOF
++		chmod +x mk_shared_lib.sh
++		;;
+ 	(mingw*)
+ 		cf_cv_shlib_version=mingw
+ 		cf_cv_shlib_version_infix=mingw
+@@ -8468,7 +8499,7 @@
+ 	])
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_PCRE2 version: 2 updated: 2018/07/14 16:47:56
++dnl CF_WITH_PCRE2 version: 3 updated: 2020/02/29 16:09:19
+ dnl -------------
+ dnl Add PCRE2 (Perl-compatible regular expressions v2) to the build if it is
+ dnl available and the user requests it.  Assume the application will otherwise
+@@ -8506,7 +8537,7 @@
+ 	esac
+ 
+ 	# either way, check for the library header files
+-	AC_CHECK_HEADERS(pcre2-posix.h pcreposix.h)
++	AC_CHECK_HEADERS(pcre2posix.h pcreposix.h)
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+Index: c++/cursslk.h
+Prereq:  1.15 
+--- ncurses-6.2-20200222+/c++/cursslk.h	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/c++/cursslk.h	2020-02-29 15:46:00.000000000 +0000
+@@ -32,7 +32,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: cursslk.h,v 1.15 2020/02/02 23:34:34 tom Exp $
++// $Id: cursslk.h,v 1.16 2020/02/29 15:46:00 anonymous.maarten Exp $
+ 
+ #ifndef NCURSES_CURSSLK_H_incl
+ #define NCURSES_CURSSLK_H_incl
+@@ -101,10 +101,10 @@
+   } Label_Layout;
+ 
+ private:
+-  static long NCURSES_IMPEXP count;               // Number of Key Sets
+-  static Label_Layout NCURSES_IMPEXP  format;     // Layout of the Key Sets
+-  static int  NCURSES_IMPEXP num_labels;          // Number Of Labels in Key Sets
+-  bool NCURSES_IMPEXP b_attrInit;                 // Are attributes initialized
++  static long count;               // Number of Key Sets
++  static Label_Layout  format;     // Layout of the Key Sets
++  static int  num_labels;          // Number Of Labels in Key Sets
++  bool b_attrInit;                 // Are attributes initialized
+ 
+   Soft_Label_Key *slk_array;       // The array of SLK's
+ 
+@@ -144,7 +144,7 @@
+ 
+   // This constructor assumes, that you already constructed a Key Set
+   // with a layout by the constructor above. This layout will be reused.
+-  NCURSES_IMPEXP Soft_Label_Key_Set();
++  Soft_Label_Key_Set();
+ 
+   Soft_Label_Key_Set& operator=(const Soft_Label_Key_Set& rhs)
+   {
+@@ -165,7 +165,7 @@
+   virtual ~Soft_Label_Key_Set() THROWS(NCursesException);
+ 
+   // Get Label# i. Label counting starts with 1!
+-  NCURSES_IMPEXP Soft_Label_Key& operator[](int i);
++  Soft_Label_Key& operator[](int i);
+ 
+   // Retrieve number of Labels
+   inline int labels() const { return num_labels; }
+Index: c++/etip.h.in
+Prereq:  1.43 
+--- ncurses-6.2-20200222+/c++/etip.h.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/c++/etip.h.in	2020-02-29 15:46:00.000000000 +0000
+@@ -32,7 +32,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: etip.h.in,v 1.43 2020/02/02 23:34:34 tom Exp $
++// $Id: etip.h.in,v 1.44 2020/02/29 15:46:00 anonymous.maarten Exp $
+ 
+ #ifndef NCURSES_ETIP_H_incl
+ #define NCURSES_ETIP_H_incl 1
+@@ -341,7 +341,6 @@
+ #  else
+ #     include 
+ #  endif
+-   extern "C" void exit(int);
+ #endif
+ 
+ inline void THROW(const NCursesException *e) {
+Index: configure
+--- ncurses-6.2-20200222+/configure	2020-02-08 21:06:19.000000000 +0000
++++ ncurses-6.2-20200229/configure	2020-02-29 21:44:17.000000000 +0000
+@@ -5961,6 +5961,37 @@
+ 
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+ 		;;
++	(mingw*msvc*)
++		cf_cv_shlib_version=mingw
++		cf_cv_shlib_version_infix=mingw
++		shlibdir=$bindir
++		MAKE_DLLS=
++		if test "$DFT_LWR_MODEL" = "shared" ; then
++			LOCAL_LDFLAGS="-link -dll"
++			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
++			EXTRA_LDFLAGS="-link -dll $EXTRA_LDFLAGS"
++		fi
++		CC_SHARED_OPTS=
++		MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh  ${LD} ${CFLAGS}'
++		RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
++		cat >mk_shared_lib.sh <<-CF_EOF
++		#!$SHELL
++		SHARED_LIB=\
++		IMPORT_LIB=\`echo "\" | sed -e 's/0-9*\.dll$\.dll.a/'\`
++		shift
++		my_ld=\
++		shift
++		cat <<-EOF
++		Linking shared library
++		** SHARED LIB \$SHARED_LIB
++		** IMPORT_LIB \$IMPORT_LIB
++EOF
++		args=\$(echo \ | sed -E "s#-l(\w*)#lib\1.a#g" | sed -E "s#-L(\w*)#-LIBPATH:\1#g")
++		exec \$my_ld -DLL -IMPLIB:"\${IMPORT_LIB}" -OUT:"\${SHARED_LIB}" ${LDFLAGS} \$args
++		mv "\${IMPORT_LIB}" "\${IMPORT_LIB}"
++CF_EOF
++		chmod +x mk_shared_lib.sh
++		;;
+ 	(mingw*)
+ 		cf_cv_shlib_version=mingw
+ 		cf_cv_shlib_version_infix=mingw
+@@ -6118,7 +6149,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 6121 "configure"
++#line 6152 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6130,16 +6161,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6133: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6164: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6136: \$? = $ac_status" >&5
++  echo "$as_me:6167: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6139: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6142: \$? = $ac_status" >&5
++  echo "$as_me:6173: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -6176,7 +6207,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:6179: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:6210: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -6186,7 +6217,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -6198,18 +6229,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:6201: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:6232: checking if CFLAGS option -$cf_opt works" >&5
+ echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
+-			if { (eval echo "$as_me:6203: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:6234: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6206: \$? = $ac_status" >&5
++  echo "$as_me:6237: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-				echo "$as_me:6208: result: yes" >&5
++				echo "$as_me:6239: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:6212: result: no" >&5
++				echo "$as_me:6243: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -6224,17 +6255,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:6227: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:6258: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6231: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6262: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models; do
+ 	case $model in
+ 	(libtool)
+ 
+-echo "$as_me:6237: checking for additional libtool options" >&5
++echo "$as_me:6268: checking for additional libtool options" >&5
+ echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
+ 
+ # Check whether --with-libtool-opts or --without-libtool-opts was given.
+@@ -6244,7 +6275,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:6247: result: $with_libtool_opts" >&5
++echo "$as_me:6278: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -6255,7 +6286,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6258: checking if exported-symbols file should be used" >&5
++echo "$as_me:6289: checking if exported-symbols file should be used" >&5
+ echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-export-syms or --without-export-syms was given.
+@@ -6270,7 +6301,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:6273: result: $with_export_syms" >&5
++echo "$as_me:6304: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -6281,15 +6312,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:6284: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:6315: error: Shared libraries are not supported in this version" >&5
+ echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+ 		# workaround for inept transition to PIE vs PIC...
+-		echo "$as_me:6289: checking if current CFLAGS link properly" >&5
++		echo "$as_me:6320: checking if current CFLAGS link properly" >&5
+ echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6292 "configure"
++#line 6323 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6301,16 +6332,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6304: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6335: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6307: \$? = $ac_status" >&5
++  echo "$as_me:6338: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6341: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6313: \$? = $ac_status" >&5
++  echo "$as_me:6344: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -6319,18 +6350,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:6322: result: $cf_cflags_work" >&5
++		echo "$as_me:6353: result: $cf_cflags_work" >&5
+ echo "${ECHO_T}$cf_cflags_work" >&6
+ 		if test "$cf_cflags_work" = no
+ 		then
+ 			test -n "$verbose" && echo "	try to work around by appending shared-options" 1>&6
+ 
+-echo "${as_me:-configure}:6328: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:6359: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:6333: checking if versioned-symbols file should be used" >&5
++echo "$as_me:6364: checking if versioned-symbols file should be used" >&5
+ echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-versioned-syms or --without-versioned-syms was given.
+@@ -6348,18 +6379,18 @@
+ (xno)
+ 	;;
+ (x/*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6351: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6382: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ (*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6356: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6387: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+    { (exit 1); exit 1; }; }
+ 	with_versioned_syms=`pwd`/"$with_versioned_syms"
+ 	;;
+ esac
+-echo "$as_me:6362: result: $with_versioned_syms" >&5
++echo "$as_me:6393: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -6375,7 +6406,7 @@
+ 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
+ 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6378: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6409: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -6383,11 +6414,11 @@
+ 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
+ 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6386: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6417: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:6390: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:6421: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -6399,7 +6430,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:6402: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:6433: checking if wildcards can be used to selectively omit symbols" >&5
+ echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
+ 		WILDCARD_SYMS=no
+ 
+@@ -6436,7 +6467,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5 |fgrep _ismissing | egrep '[ 	][DT][ 	]'`
+ 			test -n "$cf_missing" && WILDCARD_SYMS=yes
+ 		fi
+-		echo "$as_me:6470: result: $WILDCARD_SYMS" >&5
++		echo "$as_me:6501: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -6480,7 +6511,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:6483: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:6514: 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.
+@@ -6490,27 +6521,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:6493: result: $with_gpm" >&5
++echo "$as_me:6524: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:6497: checking for gpm.h" >&5
++	echo "$as_me:6528: 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 6503 "configure"
++#line 6534 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:6507: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6538: \"$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:6513: \$? = $ac_status" >&5
++  echo "$as_me:6544: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6529,7 +6560,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:6532: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:6563: 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
+ 
+@@ -6540,7 +6571,7 @@
+ 		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}:6543: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:6574: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -6548,7 +6579,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:6551: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:6582: 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
+@@ -6556,7 +6587,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6559 "configure"
++#line 6590 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6575,16 +6606,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6578: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6609: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6581: \$? = $ac_status" >&5
++  echo "$as_me:6612: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6615: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6587: \$? = $ac_status" >&5
++  echo "$as_me:6618: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6595,18 +6626,18 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6598: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6629: 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
+   with_gpm=yes
+ else
+ 
+ 				if test "$with_gpm" = maybe; then
+-					{ echo "$as_me:6605: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:6636: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:6609: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:6640: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -6617,7 +6648,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:6620: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:6651: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -6626,7 +6657,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:6629: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:6660: 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.
+@@ -6636,18 +6667,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:6639: result: $with_dlsym" >&5
++	echo "$as_me:6670: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:6644: checking for dlsym" >&5
++echo "$as_me:6675: 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 6650 "configure"
++#line 6681 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6678,16 +6709,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6681: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6712: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6684: \$? = $ac_status" >&5
++  echo "$as_me:6715: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6718: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6690: \$? = $ac_status" >&5
++  echo "$as_me:6721: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -6697,14 +6728,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6700: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:6731: 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:6707: checking for dlsym in -ldl" >&5
++echo "$as_me:6738: 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
+@@ -6712,7 +6743,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6715 "configure"
++#line 6746 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6731,16 +6762,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6765: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6737: \$? = $ac_status" >&5
++  echo "$as_me:6768: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6771: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6743: \$? = $ac_status" >&5
++  echo "$as_me:6774: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -6751,7 +6782,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6754: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:6785: 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
+ 
+@@ -6780,10 +6811,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:6783: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:6814: 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 6786 "configure"
++#line 6817 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6801,16 +6832,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6804: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6835: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6807: \$? = $ac_status" >&5
++  echo "$as_me:6838: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6810: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6841: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6813: \$? = $ac_status" >&5
++  echo "$as_me:6844: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -6821,15 +6852,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ 
+-		{ { echo "$as_me:6824: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:6855: 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:6829: result: ok" >&5
++	echo "$as_me:6860: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:6832: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:6863: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6837,12 +6868,12 @@
+ 		if test "x$with_gpm" != xyes ; then
+ 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
+ 
+-echo "${as_me:-configure}:6840: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:6871: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:6845: checking for soname of gpm library" >&5
++echo "$as_me:6876: 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
+@@ -6876,15 +6907,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:6879: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:6910: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6882: \$? = $ac_status" >&5
++  echo "$as_me:6913: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:6884: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:6915: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6887: \$? = $ac_status" >&5
++  echo "$as_me:6918: \$? = $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
+@@ -6895,7 +6926,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:6898: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:6929: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -6963,7 +6994,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:6966: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:6997: 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
+@@ -6971,7 +7002,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6974 "configure"
++#line 7005 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6990,16 +7021,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6996: \$? = $ac_status" >&5
++  echo "$as_me:7027: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7002: \$? = $ac_status" >&5
++  echo "$as_me:7033: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -7010,11 +7041,11 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7013: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:7044: 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:7017: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:7048: 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
+@@ -7038,15 +7069,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:7041: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7072: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7044: \$? = $ac_status" >&5
++  echo "$as_me:7075: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:7046: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7077: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7049: \$? = $ac_status" >&5
++  echo "$as_me:7080: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'`
+ 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
+@@ -7058,11 +7089,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:7061: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:7092: 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:7065: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:7096: 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
+ 
+@@ -7070,7 +7101,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7073: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:7104: checking if you want to use PCRE2 for regular-expressions" >&5
+ echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
+ 
+ # Check whether --with-pcre2 or --without-pcre2 was given.
+@@ -7079,7 +7110,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:7082: result: $with_pcre2" >&5
++echo "$as_me:7113: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -7087,17 +7118,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre2; then
+ 	test -n "$verbose" && echo "	found package libpcre2" 1>&6
+ 
+-echo "${as_me:-configure}:7090: testing found package libpcre2 ..." 1>&5
++echo "${as_me:-configure}:7121: testing found package libpcre2 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre2 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre2 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package libpcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:7096: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:7127: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package libpcre2 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:7100: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:7131: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7221,17 +7252,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then
+ 	test -n "$verbose" && echo "	found package libpcre" 1>&6
+ 
+-echo "${as_me:-configure}:7224: testing found package libpcre ..." 1>&5
++echo "${as_me:-configure}:7255: testing found package libpcre ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:7230: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:7261: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package libpcre LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:7234: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:7265: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7352,7 +7383,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-			{ { echo "$as_me:7355: error: Cannot find PCRE2 library" >&5
++			{ { echo "$as_me:7386: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7368,7 +7399,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:7371: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:7402: checking for regcomp in -lpcre2-posix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7376,7 +7407,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7379 "configure"
++#line 7410 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7395,16 +7426,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7398: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7429: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7401: \$? = $ac_status" >&5
++  echo "$as_me:7432: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7435: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7407: \$? = $ac_status" >&5
++  echo "$as_me:7438: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -7415,7 +7446,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7418: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:7449: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
+ if test $ac_cv_lib_pcre2_posix_regcomp = yes; then
+ 
+@@ -7436,7 +7467,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:7439: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:7470: checking for regcomp in -lpcreposix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7444,7 +7475,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7447 "configure"
++#line 7478 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7463,16 +7494,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7466: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7497: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7469: \$? = $ac_status" >&5
++  echo "$as_me:7500: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7475: \$? = $ac_status" >&5
++  echo "$as_me:7506: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -7483,7 +7514,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7486: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:7517: result: $ac_cv_lib_pcreposix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
+ if test $ac_cv_lib_pcreposix_regcomp = yes; then
+ 
+@@ -7504,7 +7535,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:7507: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:7538: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7516,26 +7547,26 @@
+ 
+ 	# either way, check for the library header files
+ 
+-for ac_header in pcre2-posix.h pcreposix.h
++for ac_header in pcre2posix.h pcreposix.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7522: checking for $ac_header" >&5
++echo "$as_me:7553: 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 7528 "configure"
++#line 7559 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7532: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:7563: \"$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:7538: \$? = $ac_status" >&5
++  echo "$as_me:7569: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7554,7 +7585,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:7557: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:7588: 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 </dev/null ; then
+-echo "$as_me:7571: checking if you want to use sysmouse" >&5
++echo "$as_me:7602: 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.
+@@ -7580,7 +7611,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7583 "configure"
++#line 7614 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7603,16 +7634,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7606: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7637: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7609: \$? = $ac_status" >&5
++  echo "$as_me:7640: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7615: \$? = $ac_status" >&5
++  echo "$as_me:7646: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -7622,7 +7653,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	fi
+-echo "$as_me:7625: result: $cf_with_sysmouse" >&5
++echo "$as_me:7656: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -7632,7 +7663,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:7635: checking if you want to disable library suffixes" >&5
++echo "$as_me:7666: checking if you want to disable library suffixes" >&5
+ echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
+ 
+ # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
+@@ -7649,13 +7680,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:7652: result: $disable_lib_suffixes" >&5
++echo "$as_me:7683: result: $disable_lib_suffixes" >&5
+ echo "${ECHO_T}$disable_lib_suffixes" >&6
+ 
+ ### If we're building with rpath, try to link non-standard libs that way too.
+ if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
+ 
+-echo "$as_me:7658: checking if rpath-hack should be disabled" >&5
++echo "$as_me:7689: checking if rpath-hack should be disabled" >&5
+ echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+@@ -7672,21 +7703,21 @@
+ 	cf_disable_rpath_hack=no
+ 
+ fi;
+-echo "$as_me:7675: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:7706: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ if test "$cf_disable_rpath_hack" = no ; then
+ 
+-echo "$as_me:7679: checking for updated LDFLAGS" >&5
++echo "$as_me:7710: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LD_RPATH_OPT" ; then
+-	echo "$as_me:7682: result: maybe" >&5
++	echo "$as_me:7713: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+ 
+ 	for ac_prog in ldd
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:7689: checking for $ac_word" >&5
++echo "$as_me:7720: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7701,7 +7732,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_cf_ldd_prog="$ac_prog"
+-echo "$as_me:7704: found $ac_dir/$ac_word" >&5
++echo "$as_me:7735: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7709,10 +7740,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:7712: result: $cf_ldd_prog" >&5
++  echo "$as_me:7743: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:7715: result: no" >&5
++  echo "$as_me:7746: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7726,7 +7757,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7729 "configure"
++#line 7760 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7738,16 +7769,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7741: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7772: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7744: \$? = $ac_status" >&5
++  echo "$as_me:7775: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7747: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7778: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7750: \$? = $ac_status" >&5
++  echo "$as_me:7781: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -7775,7 +7806,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:7778: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:7809: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -7787,11 +7818,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7790: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7821: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7794: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7825: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -7828,7 +7859,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:7831: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:7862: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -7841,11 +7872,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7844: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7875: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:7848: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:7879: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -7882,7 +7913,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:7885: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:7916: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -7895,14 +7926,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:7898: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:7929: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7902: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7933: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:7905: result: no" >&5
++	echo "$as_me:7936: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7913,7 +7944,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:7916: checking if you wish to append extra suffix to header/library paths" >&5
++echo "$as_me:7947: checking if you wish to append extra suffix to header/library paths" >&5
+ echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -7932,11 +7963,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:7935: result: $EXTRA_SUFFIX" >&5
++echo "$as_me:7966: result: $EXTRA_SUFFIX" >&5
+ echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:7939: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:7970: 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.
+@@ -7946,10 +7977,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:7949: result: $with_overwrite" >&5
++echo "$as_me:7980: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:7952: checking if external terminfo-database is used" >&5
++echo "$as_me:7983: 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.
+@@ -7959,7 +7990,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:7962: result: $use_database" >&5
++echo "$as_me:7993: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case $host_os in
+@@ -7975,7 +8006,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:7978: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:8009: checking which terminfo source-file will be installed" >&5
+ echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
+ 
+ # Check whether --with-database or --without-database was given.
+@@ -7983,10 +8014,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:7986: result: $TERMINFO_SRC" >&5
++	echo "$as_me:8017: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:7989: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:8020: 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.
+@@ -7996,13 +8027,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:7999: result: $with_hashed_db" >&5
++	echo "$as_me:8030: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:8005: checking for list of fallback descriptions" >&5
++echo "$as_me:8036: 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.
+@@ -8012,7 +8043,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:8015: result: $with_fallback" >&5
++echo "$as_me:8046: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ 
+ case ".$with_fallback" in
+@@ -8020,7 +8051,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:8023: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:8054: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -8042,10 +8073,10 @@
+ # Check whether --with-tic-path or --without-tic-path was given.
+ if test "${with_tic_path+set}" = set; then
+   withval="$with_tic_path"
+-  echo "$as_me:8045: checking for tic program for fallbacks" >&5
++  echo "$as_me:8076: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:8048: result: $TIC" >&5
++		echo "$as_me:8079: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8073,7 +8104,7 @@
+ 	TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8076: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:8107: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8086,7 +8117,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:8089: checking for $ac_word" >&5
++echo "$as_me:8120: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_TIC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8103,7 +8134,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_TIC="$ac_dir/$ac_word"
+-   echo "$as_me:8106: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8137: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8114,10 +8145,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:8117: result: $TIC" >&5
++  echo "$as_me:8148: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8120: result: no" >&5
++  echo "$as_me:8151: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8176,7 +8207,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8179: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8210: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:8225: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8200,10 +8231,10 @@
+ # Check whether --with-infocmp-path or --without-infocmp-path was given.
+ if test "${with_infocmp_path+set}" = set; then
+   withval="$with_infocmp_path"
+-  echo "$as_me:8203: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:8234: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:8206: result: $INFOCMP" >&5
++		echo "$as_me:8237: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8231,7 +8262,7 @@
+ 	INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8234: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:8265: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8244,7 +8275,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:8247: checking for $ac_word" >&5
++echo "$as_me:8278: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_INFOCMP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8261,7 +8292,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
+-   echo "$as_me:8264: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8295: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8272,10 +8303,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8275: result: $INFOCMP" >&5
++  echo "$as_me:8306: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8278: result: no" >&5
++  echo "$as_me:8309: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8334,7 +8365,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8337: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8368: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:8383: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8360,7 +8391,7 @@
+ 	: ${INFOCMP:=infocmp}
+ fi
+ 
+-echo "$as_me:8363: checking if you want modern xterm or antique" >&5
++echo "$as_me:8394: 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.
+@@ -8374,11 +8405,11 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:8377: result: $with_xterm_new" >&5
++echo "$as_me:8408: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+-echo "$as_me:8381: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:8412: checking if xterm backspace sends BS or DEL" >&5
+ echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
+ 
+ # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
+@@ -8399,7 +8430,7 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:8402: result: $with_xterm_kbs" >&5
++echo "$as_me:8433: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+@@ -8409,7 +8440,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:8412: checking for list of terminfo directories" >&5
++echo "$as_me:8443: 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.
+@@ -8449,7 +8480,7 @@
+ 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8452: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:8483: 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; }; }
+ 	;;
+@@ -8472,7 +8503,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:8475: result: $TERMINFO_DIRS" >&5
++echo "$as_me:8506: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:8515: WARNING: ignoring non-directory/file TERMINFO value" >&5
+ echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
+ 	unset TERMINFO
+ 	;;
+ esac
+ 
+-echo "$as_me:8490: checking for default terminfo directory" >&5
++echo "$as_me:8521: 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.
+@@ -8523,7 +8554,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8526: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:8557: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8532,7 +8563,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:8535: result: $TERMINFO" >&5
++echo "$as_me:8566: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:8577: 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.
+@@ -8555,7 +8586,7 @@
+   with_big_core=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8558 "configure"
++#line 8589 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8569,15 +8600,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:8572: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8603: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8575: \$? = $ac_status" >&5
++  echo "$as_me:8606: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:8577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8580: \$? = $ac_status" >&5
++  echo "$as_me:8611: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_big_core=yes
+ else
+@@ -8589,7 +8620,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi;
+-echo "$as_me:8592: result: $with_big_core" >&5
++echo "$as_me:8623: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -8599,7 +8630,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:8602: checking if big-strings option selected" >&5
++echo "$as_me:8633: 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.
+@@ -8623,14 +8654,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:8626: result: $with_big_strings" >&5
++echo "$as_me:8657: result: $with_big_strings" >&5
+ echo "${ECHO_T}$with_big_strings" >&6
+ 
+ USE_BIG_STRINGS=0
+ test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
+ 
+ ###	use option --enable-termcap to compile in the termcap fallback support
+-echo "$as_me:8633: checking if you want termcap-fallback support" >&5
++echo "$as_me:8664: 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.
+@@ -8640,14 +8671,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:8643: result: $with_termcap" >&5
++echo "$as_me:8674: result: $with_termcap" >&5
+ echo "${ECHO_T}$with_termcap" >&6
+ 
+ NCURSES_USE_TERMCAP=0
+ if test "x$with_termcap" != "xyes" ; then
+ 	if test "$use_database" = no ; then
+ 		if test -z "$with_fallback" ; then
+-			{ { echo "$as_me:8650: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:8681: 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
+@@ -8660,13 +8691,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:8663: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:8694: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+ echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 
+ 	NCURSES_USE_TERMCAP=1
+-	echo "$as_me:8669: checking for list of termcap files" >&5
++	echo "$as_me:8700: 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.
+@@ -8706,7 +8737,7 @@
+ 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8709: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:8740: 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; }; }
+ 	;;
+@@ -8729,7 +8760,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:8732: result: $TERMPATH" >&5
++	echo "$as_me:8763: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:8771: 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.
+@@ -8747,14 +8778,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:8750: result: $with_getcap" >&5
++	echo "$as_me:8781: result: $with_getcap" >&5
+ echo "${ECHO_T}$with_getcap" >&6
+ 	test "x$with_getcap" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_GETCAP 1
+ EOF
+ 
+-	echo "$as_me:8757: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:8788: 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.
+@@ -8764,7 +8795,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:8767: result: $with_getcap_cache" >&5
++	echo "$as_me:8798: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -8774,7 +8805,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:8777: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:8808: 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.
+@@ -8784,14 +8815,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:8787: result: $with_home_terminfo" >&5
++echo "$as_me:8818: result: $with_home_terminfo" >&5
+ echo "${ECHO_T}$with_home_terminfo" >&6
+ test "x$with_home_terminfo" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_HOME_TERMINFO 1
+ EOF
+ 
+-echo "$as_me:8794: checking if you want to use restricted environment when running as root" >&5
++echo "$as_me:8825: 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.
+@@ -8801,7 +8832,7 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:8804: result: $with_root_environ" >&5
++echo "$as_me:8835: result: $with_root_environ" >&5
+ echo "${ECHO_T}$with_root_environ" >&6
+ test "x$with_root_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -8816,23 +8847,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8819: checking for $ac_header" >&5
++echo "$as_me:8850: 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 8825 "configure"
++#line 8856 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8829: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8860: \"$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:8835: \$? = $ac_status" >&5
++  echo "$as_me:8866: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8851,7 +8882,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:8854: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:8885: 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 <&5
++echo "$as_me:8900: 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 8875 "configure"
++#line 8906 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8903,16 +8934,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8906: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8937: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8909: \$? = $ac_status" >&5
++  echo "$as_me:8940: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8943: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8915: \$? = $ac_status" >&5
++  echo "$as_me:8946: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8922,7 +8953,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8925: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:8956: 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 <&5
++echo "$as_me:8973: 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 8948 "configure"
++#line 8979 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8976,16 +9007,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8979: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9010: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8982: \$? = $ac_status" >&5
++  echo "$as_me:9013: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8985: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8988: \$? = $ac_status" >&5
++  echo "$as_me:9019: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8995,7 +9026,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8998: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:9029: 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 <&5
++	echo "$as_me:9040: 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
+@@ -9019,7 +9050,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9022 "configure"
++#line 9053 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9049,15 +9080,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9083: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9055: \$? = $ac_status" >&5
++  echo "$as_me:9086: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9060: \$? = $ac_status" >&5
++  echo "$as_me:9091: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -9075,7 +9106,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:9078: result: $cf_cv_link_funcs" >&5
++echo "$as_me:9109: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -9095,7 +9126,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 "x$ac_cv_func_symlink" = xyes ; then
+-	echo "$as_me:9098: checking if tic should use symbolic links" >&5
++	echo "$as_me:9129: 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.
+@@ -9105,21 +9136,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:9108: result: $with_symlinks" >&5
++	echo "$as_me:9139: 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:9115: checking if tic should use hard links" >&5
++	echo "$as_me:9146: checking if tic should use hard links" >&5
+ echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
+ 	if test "x$ac_cv_func_link" = xyes ; then
+ 		with_links=yes
+ 	else
+ 		with_links=no
+ 	fi
+-	echo "$as_me:9122: result: $with_links" >&5
++	echo "$as_me:9153: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -9135,7 +9166,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:9138: checking if you want broken-linker support code" >&5
++echo "$as_me:9169: 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.
+@@ -9145,7 +9176,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:9148: result: $with_broken_linker" >&5
++echo "$as_me:9179: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : ${BROKEN_LINKER:=0}
+@@ -9159,7 +9190,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:9162: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:9193: 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.
+@@ -9169,7 +9200,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:9172: result: $with_bsdpad" >&5
++echo "$as_me:9203: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9188,14 +9219,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:9191: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:9222: checking if the POSIX test-macros are already defined" >&5
+ echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+ if test "${cf_cv_posix_visible+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9198 "configure"
++#line 9229 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9214,16 +9245,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9217: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9248: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9220: \$? = $ac_status" >&5
++  echo "$as_me:9251: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9223: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9254: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9226: \$? = $ac_status" >&5
++  echo "$as_me:9257: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -9234,7 +9265,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9237: result: $cf_cv_posix_visible" >&5
++echo "$as_me:9268: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -9279,14 +9310,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:9282: checking if this is the GNU C library" >&5
++echo "$as_me:9313: checking if this is the GNU C library" >&5
+ echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9289 "configure"
++#line 9320 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9305,16 +9336,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9339: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9311: \$? = $ac_status" >&5
++  echo "$as_me:9342: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9317: \$? = $ac_status" >&5
++  echo "$as_me:9348: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -9325,7 +9356,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9328: result: $cf_cv_gnu_library" >&5
++echo "$as_me:9359: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -9333,7 +9364,7 @@
+ 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+ 	# was changed to help a little.  newlib incorporated the change about 4
+ 	# years later.
+-	echo "$as_me:9336: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:9367: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+ echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9345,7 +9376,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9348 "configure"
++#line 9379 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9364,16 +9395,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9367: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9398: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9370: \$? = $ac_status" >&5
++  echo "$as_me:9401: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9376: \$? = $ac_status" >&5
++  echo "$as_me:9407: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -9385,12 +9416,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:9388: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:9419: result: $cf_cv_gnu_library_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+ 
+ 	if test "x$cf_cv_gnu_library_219" = xyes; then
+ 		cf_save="$CPPFLAGS"
+-		echo "$as_me:9393: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:9424: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9495,7 +9526,7 @@
+ fi
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 9498 "configure"
++#line 9529 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -9515,16 +9546,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9518: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9549: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9521: \$? = $ac_status" >&5
++  echo "$as_me:9552: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9555: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9527: \$? = $ac_status" >&5
++  echo "$as_me:9558: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -9535,7 +9566,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9538: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:9569: result: $cf_cv_gnu_dftsrc_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+ 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+ 	else
+@@ -9544,14 +9575,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:9547: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:9578: 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 9554 "configure"
++#line 9585 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9566,16 +9597,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9600: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9572: \$? = $ac_status" >&5
++  echo "$as_me:9603: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9606: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9578: \$? = $ac_status" >&5
++  echo "$as_me:9609: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -9682,7 +9713,7 @@
+ fi
+ 
+ 			 cat >conftest.$ac_ext <<_ACEOF
+-#line 9685 "configure"
++#line 9716 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9697,16 +9728,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9700: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9731: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9703: \$? = $ac_status" >&5
++  echo "$as_me:9734: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9709: \$? = $ac_status" >&5
++  echo "$as_me:9740: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -9721,12 +9752,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9724: result: $cf_cv_gnu_source" >&5
++echo "$as_me:9755: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ 
+ 		if test "$cf_cv_gnu_source" = yes
+ 		then
+-		echo "$as_me:9729: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:9760: checking if we should also define _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_default_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9736,7 +9767,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 9739 "configure"
++#line 9770 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9751,16 +9782,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9754: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9785: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9757: \$? = $ac_status" >&5
++  echo "$as_me:9788: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9763: \$? = $ac_status" >&5
++  echo "$as_me:9794: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -9771,7 +9802,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9774: result: $cf_cv_default_source" >&5
++echo "$as_me:9805: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -9808,16 +9839,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:9811: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:9842: 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}:9817: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:9848: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9820 "configure"
++#line 9851 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9832,16 +9863,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9835: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9866: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9838: \$? = $ac_status" >&5
++  echo "$as_me:9869: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9872: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9844: \$? = $ac_status" >&5
++  echo "$as_me:9875: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -9862,7 +9893,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9865 "configure"
++#line 9896 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9877,16 +9908,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9880: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9911: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9883: \$? = $ac_status" >&5
++  echo "$as_me:9914: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9886: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9917: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9889: \$? = $ac_status" >&5
++  echo "$as_me:9920: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9897,7 +9928,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:9900: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:9931: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -9905,10 +9936,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:9908: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:9939: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 9911 "configure"
++#line 9942 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9923,16 +9954,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9926: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9957: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9929: \$? = $ac_status" >&5
++  echo "$as_me:9960: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9932: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9935: \$? = $ac_status" >&5
++  echo "$as_me:9966: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9948,7 +9979,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9951: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:9982: 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
+@@ -10088,14 +10119,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:10091: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10122: 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 10098 "configure"
++#line 10129 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10114,16 +10145,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10117: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10120: \$? = $ac_status" >&5
++  echo "$as_me:10151: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10123: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10126: \$? = $ac_status" >&5
++  echo "$as_me:10157: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10135,7 +10166,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 10138 "configure"
++#line 10169 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10154,16 +10185,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10157: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10188: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10160: \$? = $ac_status" >&5
++  echo "$as_me:10191: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10163: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10194: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10166: \$? = $ac_status" >&5
++  echo "$as_me:10197: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10178,7 +10209,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:10181: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10212: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10308,16 +10339,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10311: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10342: 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}:10317: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10348: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10320 "configure"
++#line 10351 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10332,16 +10363,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10335: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10366: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10338: \$? = $ac_status" >&5
++  echo "$as_me:10369: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10341: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10372: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10344: \$? = $ac_status" >&5
++  echo "$as_me:10375: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -10362,7 +10393,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 10365 "configure"
++#line 10396 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10377,16 +10408,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10380: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10411: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10383: \$? = $ac_status" >&5
++  echo "$as_me:10414: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10386: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10389: \$? = $ac_status" >&5
++  echo "$as_me:10420: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10397,7 +10428,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:10400: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:10431: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -10405,10 +10436,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:10408: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:10439: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 10411 "configure"
++#line 10442 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10423,16 +10454,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10426: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10457: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10429: \$? = $ac_status" >&5
++  echo "$as_me:10460: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10463: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10435: \$? = $ac_status" >&5
++  echo "$as_me:10466: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10448,7 +10479,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:10451: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:10482: 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
+@@ -10642,7 +10673,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:10645: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:10676: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -10652,7 +10683,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:10655: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:10686: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -10662,7 +10693,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:10665: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:10696: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -10672,10 +10703,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:10675: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:10706: checking if _XOPEN_SOURCE really is set" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10678 "configure"
++#line 10709 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10690,16 +10721,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10693: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10724: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10696: \$? = $ac_status" >&5
++  echo "$as_me:10727: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10699: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10730: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10702: \$? = $ac_status" >&5
++  echo "$as_me:10733: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -10708,12 +10739,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:10711: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:10742: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
+ 	if test $cf_XOPEN_SOURCE_set = yes
+ 	then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 10716 "configure"
++#line 10747 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10728,16 +10759,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10731: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10762: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10734: \$? = $ac_status" >&5
++  echo "$as_me:10765: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10740: \$? = $ac_status" >&5
++  echo "$as_me:10771: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -10748,19 +10779,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		if test $cf_XOPEN_SOURCE_set_ok = no
+ 		then
+-			{ echo "$as_me:10751: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:10782: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:10756: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10787: 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 10763 "configure"
++#line 10794 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10779,16 +10810,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10782: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10813: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10785: \$? = $ac_status" >&5
++  echo "$as_me:10816: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10819: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10791: \$? = $ac_status" >&5
++  echo "$as_me:10822: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10800,7 +10831,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 10803 "configure"
++#line 10834 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10819,16 +10850,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10822: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10853: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10825: \$? = $ac_status" >&5
++  echo "$as_me:10856: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10831: \$? = $ac_status" >&5
++  echo "$as_me:10862: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10843,7 +10874,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:10846: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10877: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10966,14 +10997,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:10969: checking if SIGWINCH is defined" >&5
++echo "$as_me:11000: 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 10976 "configure"
++#line 11007 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10988,23 +11019,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10991: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11022: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10994: \$? = $ac_status" >&5
++  echo "$as_me:11025: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11000: \$? = $ac_status" >&5
++  echo "$as_me:11031: \$? = $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 11007 "configure"
++#line 11038 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11022,16 +11053,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11056: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11028: \$? = $ac_status" >&5
++  echo "$as_me:11059: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11062: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11034: \$? = $ac_status" >&5
++  echo "$as_me:11065: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -11045,11 +11076,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11048: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:11079: 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:11052: checking for actual SIGWINCH definition" >&5
++echo "$as_me:11083: 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
+@@ -11060,7 +11091,7 @@
+ while test $cf_sigwinch != 1
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11063 "configure"
++#line 11094 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11082,16 +11113,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11085: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11116: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11088: \$? = $ac_status" >&5
++  echo "$as_me:11119: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11091: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11094: \$? = $ac_status" >&5
++  echo "$as_me:11125: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -11105,7 +11136,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11108: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:11139: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -11115,13 +11146,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:11118: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:11149: 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 11124 "configure"
++#line 11155 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11133,16 +11164,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11136: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11167: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11139: \$? = $ac_status" >&5
++  echo "$as_me:11170: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11173: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11145: \$? = $ac_status" >&5
++  echo "$as_me:11176: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -11153,7 +11184,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11156: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:11187: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test $am_cv_langinfo_codeset = yes; then
+ 
+@@ -11167,7 +11198,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:11170: checking if you want wide-character code" >&5
++echo "$as_me:11201: 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.
+@@ -11177,7 +11208,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:11180: result: $with_widec" >&5
++echo "$as_me:11211: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -11201,23 +11232,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11204: checking for $ac_header" >&5
++echo "$as_me:11235: 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 11210 "configure"
++#line 11241 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11214: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11245: \"$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:11220: \$? = $ac_status" >&5
++  echo "$as_me:11251: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11236,7 +11267,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:11239: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:11270: 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 <&5
++echo "$as_me:11280: checking if wchar.h can be used as is" >&5
+ echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
+ if test "${cf_cv_wchar_h_okay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11256 "configure"
++#line 11287 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11275,16 +11306,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11309: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11281: \$? = $ac_status" >&5
++  echo "$as_me:11312: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11287: \$? = $ac_status" >&5
++  echo "$as_me:11318: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -11294,16 +11325,16 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11297: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:11328: result: $cf_cv_wchar_h_okay" >&5
+ echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
+ 
+ if test $cf_cv_wchar_h_okay = no
+ then
+ 
+-echo "$as_me:11303: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:11334: 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 11306 "configure"
++#line 11337 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -11319,16 +11350,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11322: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11353: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11325: \$? = $ac_status" >&5
++  echo "$as_me:11356: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11328: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11331: \$? = $ac_status" >&5
++  echo "$as_me:11362: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=no
+ else
+@@ -11337,16 +11368,16 @@
+ cf_result=yes
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:11340: result: $cf_result" >&5
++echo "$as_me:11371: 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:11346: checking checking for compatible value versus " >&5
++	echo "$as_me:11377: 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 11349 "configure"
++#line 11380 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -11362,16 +11393,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11365: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11396: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11368: \$? = $ac_status" >&5
++  echo "$as_me:11399: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11402: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11374: \$? = $ac_status" >&5
++  echo "$as_me:11405: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -11380,7 +11411,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:11383: result: $cf_result" >&5
++	echo "$as_me:11414: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -11390,7 +11421,7 @@
+ 
+ fi
+ 
+-echo "$as_me:11393: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:11424: checking if wcwidth agrees graphics are single-width" >&5
+ echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
+ if test "${cf_cv_wcwidth_graphics+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11461,7 +11492,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11464 "configure"
++#line 11495 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11505,15 +11536,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:11508: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11539: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11511: \$? = $ac_status" >&5
++  echo "$as_me:11542: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:11513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11544: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11516: \$? = $ac_status" >&5
++  echo "$as_me:11547: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -11526,7 +11557,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:11529: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:11560: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -11537,13 +11568,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:11540: checking for $ac_func" >&5
++echo "$as_me:11571: 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 11546 "configure"
++#line 11577 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11574,16 +11605,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11577: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11608: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11580: \$? = $ac_status" >&5
++  echo "$as_me:11611: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11586: \$? = $ac_status" >&5
++  echo "$as_me:11617: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -11593,7 +11624,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11596: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:11627: 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 <&5
++echo "$as_me:11639: 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
+@@ -11613,7 +11644,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11616 "configure"
++#line 11647 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11626,16 +11657,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11629: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11660: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11632: \$? = $ac_status" >&5
++  echo "$as_me:11663: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11635: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11666: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11638: \$? = $ac_status" >&5
++  echo "$as_me:11669: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -11647,12 +11678,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:11650: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:11681: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11655 "configure"
++#line 11686 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11665,16 +11696,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11668: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11699: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11671: \$? = $ac_status" >&5
++  echo "$as_me:11702: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11674: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11705: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11677: \$? = $ac_status" >&5
++  echo "$as_me:11708: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -11688,7 +11719,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11691 "configure"
++#line 11722 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11701,16 +11732,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11704: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11707: \$? = $ac_status" >&5
++  echo "$as_me:11738: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11710: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11713: \$? = $ac_status" >&5
++  echo "$as_me:11744: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -11727,9 +11758,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:11730: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:11761: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:11732: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:11763: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -11820,7 +11851,7 @@
+ 		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}:11823: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:11854: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -11828,7 +11859,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 11831 "configure"
++#line 11862 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11841,21 +11872,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11844: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11875: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11847: \$? = $ac_status" >&5
++  echo "$as_me:11878: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11850: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11853: \$? = $ac_status" >&5
++  echo "$as_me:11884: \$? = $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}:11858: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:11889: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -11873,7 +11904,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:11876: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:11907: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -11948,13 +11979,13 @@
+ 				if test -d $cf_cv_library_path_utf8 ; then
+ 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:11951: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:11982: 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 11957 "configure"
++#line 11988 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11967,21 +11998,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11970: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12001: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11973: \$? = $ac_status" >&5
++  echo "$as_me:12004: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12007: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11979: \$? = $ac_status" >&5
++  echo "$as_me:12010: \$? = $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}:11984: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12015: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -12023,7 +12054,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12026: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:12057: 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
+@@ -12061,7 +12092,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 12064 "configure"
++#line 12095 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12073,16 +12104,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12076: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12107: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12079: \$? = $ac_status" >&5
++  echo "$as_me:12110: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12082: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12085: \$? = $ac_status" >&5
++  echo "$as_me:12116: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12099,7 +12130,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:12102: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12133: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12135,7 +12166,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}:12138: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:12169: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -12167,14 +12198,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:12170: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:12201: 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 12177 "configure"
++#line 12208 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12192,23 +12223,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12226: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12198: \$? = $ac_status" >&5
++  echo "$as_me:12229: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12232: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12204: \$? = $ac_status" >&5
++  echo "$as_me:12235: \$? = $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 12211 "configure"
++#line 12242 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12227,16 +12258,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12230: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12261: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12233: \$? = $ac_status" >&5
++  echo "$as_me:12264: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12239: \$? = $ac_status" >&5
++  echo "$as_me:12270: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -12248,7 +12279,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12251: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:12282: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -12266,14 +12297,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:12269: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:12300: 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 12276 "configure"
++#line 12307 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12291,23 +12322,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12325: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12297: \$? = $ac_status" >&5
++  echo "$as_me:12328: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12303: \$? = $ac_status" >&5
++  echo "$as_me:12334: \$? = $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 12310 "configure"
++#line 12341 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12326,16 +12357,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12329: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12360: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12332: \$? = $ac_status" >&5
++  echo "$as_me:12363: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12335: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12366: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12338: \$? = $ac_status" >&5
++  echo "$as_me:12369: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -12347,7 +12378,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12350: result: $cf_cv_wchar_t" >&5
++echo "$as_me:12381: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -12370,14 +12401,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:12373: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:12404: 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 12380 "configure"
++#line 12411 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12395,23 +12426,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12398: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12429: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12401: \$? = $ac_status" >&5
++  echo "$as_me:12432: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12435: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12407: \$? = $ac_status" >&5
++  echo "$as_me:12438: \$? = $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 12414 "configure"
++#line 12445 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12430,16 +12461,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12433: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12464: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12436: \$? = $ac_status" >&5
++  echo "$as_me:12467: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12470: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12442: \$? = $ac_status" >&5
++  echo "$as_me:12473: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -12451,7 +12482,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12454: result: $cf_cv_wint_t" >&5
++echo "$as_me:12485: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -12483,7 +12514,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:12486: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:12517: 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.
+@@ -12493,7 +12524,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:12496: result: $with_lp64" >&5
++echo "$as_me:12527: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -12509,7 +12540,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:12512: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:12543: 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
+@@ -12521,7 +12552,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 12524 "configure"
++#line 12555 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12541,16 +12572,16 @@
+ }
+ _ACEOF
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12544: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12575: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12547: \$? = $ac_status" >&5
++  echo "$as_me:12578: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12550: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12553: \$? = $ac_status" >&5
++  echo "$as_me:12584: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12560,16 +12591,16 @@
+ rm -f conftest.$ac_objext
+      	 CC="$CC -n32"
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12563: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12594: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12566: \$? = $ac_status" >&5
++  echo "$as_me:12597: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12600: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12572: \$? = $ac_status" >&5
++  echo "$as_me:12603: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -12583,13 +12614,13 @@
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-echo "$as_me:12586: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:12617: 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:12592: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:12623: 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
+@@ -12597,7 +12628,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12600 "configure"
++#line 12631 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12617,16 +12648,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12620: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12651: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12623: \$? = $ac_status" >&5
++  echo "$as_me:12654: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12657: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12629: \$? = $ac_status" >&5
++  echo "$as_me:12660: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12635,7 +12666,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12638 "configure"
++#line 12669 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -12656,16 +12687,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12659: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12690: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12662: \$? = $ac_status" >&5
++  echo "$as_me:12693: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12668: \$? = $ac_status" >&5
++  echo "$as_me:12699: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -12676,7 +12707,7 @@
+   break
+ done
+ fi
+-echo "$as_me:12679: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:12710: 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
+ 
+@@ -12686,7 +12717,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:12689: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:12720: 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
+@@ -12694,7 +12725,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12697 "configure"
++#line 12728 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12714,16 +12745,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12717: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12748: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12720: \$? = $ac_status" >&5
++  echo "$as_me:12751: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12723: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12754: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12726: \$? = $ac_status" >&5
++  echo "$as_me:12757: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12732,7 +12763,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12735 "configure"
++#line 12766 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -12753,16 +12784,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12756: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12787: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12759: \$? = $ac_status" >&5
++  echo "$as_me:12790: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12793: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12765: \$? = $ac_status" >&5
++  echo "$as_me:12796: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -12773,7 +12804,7 @@
+   break
+ done
+ fi
+-echo "$as_me:12776: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:12807: 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
+ 
+@@ -12786,7 +12817,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:12789: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:12820: 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
+@@ -12794,7 +12825,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12797 "configure"
++#line 12828 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12806,16 +12837,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12809: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12840: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12812: \$? = $ac_status" >&5
++  echo "$as_me:12843: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12815: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12846: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12818: \$? = $ac_status" >&5
++  echo "$as_me:12849: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12824,7 +12855,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12827 "configure"
++#line 12858 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -12837,16 +12868,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12840: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12871: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12843: \$? = $ac_status" >&5
++  echo "$as_me:12874: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12877: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12849: \$? = $ac_status" >&5
++  echo "$as_me:12880: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -12857,7 +12888,7 @@
+   break
+ done
+ fi
+-echo "$as_me:12860: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:12891: 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
+ 
+@@ -12871,13 +12902,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:12874: checking for fseeko" >&5
++echo "$as_me:12905: 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 12880 "configure"
++#line 12911 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12889,16 +12920,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12892: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12923: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12895: \$? = $ac_status" >&5
++  echo "$as_me:12926: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12901: \$? = $ac_status" >&5
++  echo "$as_me:12932: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -12908,7 +12939,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12911: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:12942: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -12947,14 +12978,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:12950: checking whether to use struct dirent64" >&5
++	echo "$as_me:12981: 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 12957 "configure"
++#line 12988 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -12976,16 +13007,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12979: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13010: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12982: \$? = $ac_status" >&5
++  echo "$as_me:13013: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12985: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12988: \$? = $ac_status" >&5
++  echo "$as_me:13019: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -12996,7 +13027,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12999: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13030: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13006,7 +13037,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:13009: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:13040: 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.
+@@ -13016,14 +13047,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:13019: result: $with_tparm_varargs" >&5
++echo "$as_me:13050: result: $with_tparm_varargs" >&5
+ echo "${ECHO_T}$with_tparm_varargs" >&6
+ NCURSES_TPARM_VARARGS=0
+ test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
+ 
+ ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
+ if test "$with_ticlib" != no ; then
+-echo "$as_me:13026: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:13057: 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.
+@@ -13033,14 +13064,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:13036: result: $with_tic_depends" >&5
++echo "$as_me:13067: result: $with_tic_depends" >&5
+ echo "${ECHO_T}$with_tic_depends" >&6
+ else
+ 	with_tic_depends=no
+ fi
+ 
+ ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
+-echo "$as_me:13043: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
++echo "$as_me:13074: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
+ echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
+ 
+ # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
+@@ -13052,15 +13083,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:13055: result: yes" >&5
++	echo "$as_me:13086: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:13059: result: no" >&5
++	echo "$as_me:13090: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13063: checking for X11 rgb file" >&5
++echo "$as_me:13094: checking for X11 rgb file" >&5
+ echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
+ 
+ # Check whether --with-x11-rgb or --without-x11-rgb was given.
+@@ -13124,7 +13155,7 @@
+ 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:13127: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:13158: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -13132,7 +13163,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13135: result: $RGB_PATH" >&5
++echo "$as_me:13166: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:13180: 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.
+@@ -13156,10 +13187,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:13159: result: $NCURSES_BOOL" >&5
++echo "$as_me:13190: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:13162: checking for alternate terminal capabilities file" >&5
++echo "$as_me:13193: 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.
+@@ -13170,11 +13201,11 @@
+   TERMINFO_CAPS=Caps
+ fi;
+ test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:13173: result: $TERMINFO_CAPS" >&5
++echo "$as_me:13204: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:13177: checking for type of chtype" >&5
++echo "$as_me:13208: 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.
+@@ -13184,11 +13215,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:13187: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:13218: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:13191: checking for type of ospeed" >&5
++echo "$as_me:13222: 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.
+@@ -13198,11 +13229,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:13201: result: $NCURSES_OSPEED" >&5
++echo "$as_me:13232: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:13205: checking for type of mmask_t" >&5
++echo "$as_me:13236: 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.
+@@ -13212,11 +13243,11 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:13215: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:13246: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:13219: checking for size CCHARW_MAX" >&5
++echo "$as_me:13250: checking for size CCHARW_MAX" >&5
+ echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
+ 
+ # Check whether --with-ccharw-max or --without-ccharw-max was given.
+@@ -13226,16 +13257,16 @@
+ else
+   NCURSES_CCHARW_MAX=5
+ fi;
+-echo "$as_me:13229: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:13260: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:13232: checking for ANSI C header files" >&5
++echo "$as_me:13263: 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 13238 "configure"
++#line 13269 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -13243,13 +13274,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:13246: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13277: \"$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:13252: \$? = $ac_status" >&5
++  echo "$as_me:13283: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13271,7 +13302,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 13274 "configure"
++#line 13305 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -13289,7 +13320,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 13292 "configure"
++#line 13323 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -13310,7 +13341,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13313 "configure"
++#line 13344 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -13336,15 +13367,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13370: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13342: \$? = $ac_status" >&5
++  echo "$as_me:13373: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13375: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13347: \$? = $ac_status" >&5
++  echo "$as_me:13378: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -13357,7 +13388,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:13360: result: $ac_cv_header_stdc" >&5
++echo "$as_me:13391: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -13373,28 +13404,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13376: checking for $ac_header" >&5
++echo "$as_me:13407: 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 13382 "configure"
++#line 13413 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13388: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13419: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13391: \$? = $ac_status" >&5
++  echo "$as_me:13422: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13425: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13397: \$? = $ac_status" >&5
++  echo "$as_me:13428: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -13404,7 +13435,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13407: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13438: 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 <&5
++echo "$as_me:13448: 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 13423 "configure"
++#line 13454 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13435,16 +13466,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13438: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13469: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13441: \$? = $ac_status" >&5
++  echo "$as_me:13472: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13444: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13475: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13447: \$? = $ac_status" >&5
++  echo "$as_me:13478: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -13454,10 +13485,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13457: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:13488: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:13460: checking size of signed char" >&5
++echo "$as_me:13491: 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
+@@ -13466,7 +13497,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13469 "configure"
++#line 13500 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13478,21 +13509,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13481: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13512: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13484: \$? = $ac_status" >&5
++  echo "$as_me:13515: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13487: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13490: \$? = $ac_status" >&5
++  echo "$as_me:13521: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13495 "configure"
++#line 13526 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13504,16 +13535,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13507: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13538: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13510: \$? = $ac_status" >&5
++  echo "$as_me:13541: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13544: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13516: \$? = $ac_status" >&5
++  echo "$as_me:13547: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -13529,7 +13560,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13532 "configure"
++#line 13563 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13541,16 +13572,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13544: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13575: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13547: \$? = $ac_status" >&5
++  echo "$as_me:13578: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13550: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13581: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13553: \$? = $ac_status" >&5
++  echo "$as_me:13584: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -13566,7 +13597,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 13569 "configure"
++#line 13600 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13578,16 +13609,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13581: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13612: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13584: \$? = $ac_status" >&5
++  echo "$as_me:13615: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13587: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13618: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13590: \$? = $ac_status" >&5
++  echo "$as_me:13621: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -13600,12 +13631,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:13603: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:13634: 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 13608 "configure"
++#line 13639 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13621,15 +13652,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13624: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13655: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13627: \$? = $ac_status" >&5
++  echo "$as_me:13658: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13660: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13632: \$? = $ac_status" >&5
++  echo "$as_me:13663: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -13645,7 +13676,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:13648: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:13679: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:13690: 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.
+@@ -13666,12 +13697,12 @@
+ else
+   with_signed_char=no
+ fi;
+-echo "$as_me:13669: result: $with_signed_char" >&5
++echo "$as_me:13700: result: $with_signed_char" >&5
+ echo "${ECHO_T}$with_signed_char" >&6
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+ 
+ ###   use option --with-tparm-arg to override tparm's argument type
+-echo "$as_me:13674: checking for type of tparm args" >&5
++echo "$as_me:13705: checking for type of tparm args" >&5
+ echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -13681,11 +13712,11 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:13684: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:13715: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:13688: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:13719: 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.
+@@ -13695,7 +13726,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:13698: result: $with_rcs_ids" >&5
++echo "$as_me:13729: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -13704,7 +13735,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:13707: checking format of man-pages" >&5
++echo "$as_me:13738: 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.
+@@ -13793,14 +13824,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:13796: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:13827: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:13799: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:13830: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:13803: checking for manpage renaming" >&5
++echo "$as_me:13834: 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.
+@@ -13828,7 +13859,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:13831: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:13862: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -13842,10 +13873,10 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:13845: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:13876: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:13848: checking if manpage aliases will be installed" >&5
++echo "$as_me:13879: 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.
+@@ -13856,7 +13887,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:13859: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:13890: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -13870,7 +13901,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:13873: checking if manpage symlinks should be used" >&5
++echo "$as_me:13904: 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.
+@@ -13883,17 +13914,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:13886: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:13917: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:13892: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:13923: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:13896: checking for manpage tbl" >&5
++echo "$as_me:13927: 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.
+@@ -13904,7 +13935,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:13907: result: $MANPAGE_TBL" >&5
++echo "$as_me:13938: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -14237,7 +14268,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:14240: checking if you want to build with function extensions" >&5
++echo "$as_me:14271: 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.
+@@ -14247,7 +14278,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:14250: result: $with_ext_funcs" >&5
++echo "$as_me:14281: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -14307,7 +14338,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:14310: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:14341: checking if you want to build with SCREEN extensions" >&5
+ echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
+@@ -14317,7 +14348,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:14320: result: $with_sp_funcs" >&5
++echo "$as_me:14351: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -14336,7 +14367,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:14339: checking if you want to build with terminal-driver" >&5
++echo "$as_me:14370: checking if you want to build with terminal-driver" >&5
+ echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
+ 
+ # Check whether --enable-term-driver or --disable-term-driver was given.
+@@ -14346,7 +14377,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:14349: result: $with_term_driver" >&5
++echo "$as_me:14380: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -14355,19 +14386,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:14358: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:14389: error: The term-driver option conflicts with the termlib option" >&5
+ echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 	if test "x$with_sp_funcs" != xyes ; then
+-		{ { echo "$as_me:14363: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:14394: error: The term-driver option relies upon sp-funcs" >&5
+ echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:14370: checking for extended use of const keyword" >&5
++echo "$as_me:14401: 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.
+@@ -14377,7 +14408,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:14380: result: $with_ext_const" >&5
++echo "$as_me:14411: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -14385,7 +14416,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:14388: checking if you want to use extended colors" >&5
++echo "$as_me:14419: 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.
+@@ -14395,12 +14426,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:14398: result: $with_ext_colors" >&5
++echo "$as_me:14429: result: $with_ext_colors" >&5
+ echo "${ECHO_T}$with_ext_colors" >&6
+ NCURSES_EXT_COLORS=0
+ if test "x$with_ext_colors" = xyes ; then
+ 	if test "x$with_widec" != xyes ; then
+-		{ echo "$as_me:14403: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:14434: WARNING: This option applies only to wide-character library" >&5
+ echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
+ 	else
+ 		# cannot be ABI 5 since it changes sizeof(cchar_t)
+@@ -14410,7 +14441,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:14413: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:14444: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -14438,7 +14469,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:14441: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:14472: 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.
+@@ -14448,7 +14479,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:14451: result: $with_ext_mouse" >&5
++echo "$as_me:14482: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+@@ -14459,7 +14490,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:14462: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:14493: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -14468,7 +14499,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:14471: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:14502: checking if you want to use extended putwin/screendump" >&5
+ echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
+@@ -14478,7 +14509,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:14481: result: $with_ext_putwin" >&5
++echo "$as_me:14512: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -14488,7 +14519,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14491: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:14522: 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.
+@@ -14498,7 +14529,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:14501: result: $with_no_padding" >&5
++echo "$as_me:14532: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14506,7 +14537,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:14509: checking if you want SIGWINCH handler" >&5
++echo "$as_me:14540: 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.
+@@ -14516,7 +14547,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:14519: result: $with_sigwinch" >&5
++echo "$as_me:14550: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14524,7 +14555,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:14527: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:14558: 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.
+@@ -14534,14 +14565,14 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:14537: result: $with_tcap_names" >&5
++echo "$as_me:14568: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+ 
+ ##############################################################################
+ 
+-echo "$as_me:14544: checking if you want to link with the pthread library" >&5
++echo "$as_me:14575: 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.
+@@ -14551,27 +14582,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:14554: result: $with_pthread" >&5
++echo "$as_me:14585: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:14558: checking for pthread.h" >&5
++	echo "$as_me:14589: 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 14564 "configure"
++#line 14595 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:14568: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14599: \"$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:14574: \$? = $ac_status" >&5
++  echo "$as_me:14605: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14590,7 +14621,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14593: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:14624: 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
+ 
+@@ -14600,7 +14631,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:14603: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:14634: checking if we can link with the $cf_lib_pthread library" >&5
+ echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
+ 	    cf_save_LIBS="$LIBS"
+ 
+@@ -14621,7 +14652,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+-#line 14624 "configure"
++#line 14655 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14638,16 +14669,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14641: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14672: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14644: \$? = $ac_status" >&5
++  echo "$as_me:14675: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14647: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14678: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14650: \$? = $ac_status" >&5
++  echo "$as_me:14681: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_pthread=yes
+ else
+@@ -14657,7 +14688,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:14660: result: $with_pthread" >&5
++	    echo "$as_me:14691: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -14685,7 +14716,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:14688: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:14719: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14695,13 +14726,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:14698: checking for pthread_kill" >&5
++	echo "$as_me:14729: checking for pthread_kill" >&5
+ echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
+ if test "${ac_cv_func_pthread_kill+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14704 "configure"
++#line 14735 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14732,16 +14763,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14735: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14766: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14738: \$? = $ac_status" >&5
++  echo "$as_me:14769: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14772: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14744: \$? = $ac_status" >&5
++  echo "$as_me:14775: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -14751,11 +14782,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14754: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:14785: result: $ac_cv_func_pthread_kill" >&5
+ echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
+ if test $ac_cv_func_pthread_kill = yes; then
+ 
+-		echo "$as_me:14758: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:14789: checking if you want to allow EINTR in wgetch with pthreads" >&5
+ echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
+@@ -14765,7 +14796,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:14768: result: $use_pthreads_eintr" >&5
++		echo "$as_me:14799: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -14776,7 +14807,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:14779: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:14810: 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.
+@@ -14786,18 +14817,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:14789: result: $use_weak_symbols" >&5
++	echo "$as_me:14820: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:14793: checking if $CC supports weak symbols" >&5
++echo "$as_me:14824: 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 14800 "configure"
++#line 14831 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14823,16 +14854,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14826: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14857: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14829: \$? = $ac_status" >&5
++  echo "$as_me:14860: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14832: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14835: \$? = $ac_status" >&5
++  echo "$as_me:14866: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -14843,7 +14874,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:14846: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:14877: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -14893,7 +14924,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:14896: checking if you want reentrant code" >&5
++echo "$as_me:14927: checking if you want reentrant code" >&5
+ echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
+ 
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -14903,7 +14934,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:14906: result: $with_reentrant" >&5
++echo "$as_me:14937: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -14991,7 +15022,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:14994: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15025: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15003,7 +15034,7 @@
+ 	NCURSES_SIZE_T=short
+ fi
+ 
+-echo "$as_me:15006: checking if you want opaque curses-library structures" >&5
++echo "$as_me:15037: checking if you want opaque curses-library structures" >&5
+ echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -15025,16 +15056,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
+ 
+ fi;
+-echo "$as_me:15028: result: $enable_opaque_curses" >&5
++echo "$as_me:15059: result: $enable_opaque_curses" >&5
+ echo "${ECHO_T}$enable_opaque_curses" >&6
+ 
+ test "$cf_cv_enable_reentrant" = 1 && \
+ test "$enable_opaque_curses" = no && \
+-{ { echo "$as_me:15033: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:15064: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:15037: checking if you want opaque form-library structures" >&5
++echo "$as_me:15068: checking if you want opaque form-library structures" >&5
+ echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -15044,10 +15075,10 @@
+ else
+   enable_opaque_form=no
+ fi;
+-echo "$as_me:15047: result: $enable_opaque_form" >&5
++echo "$as_me:15078: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:15050: checking if you want opaque menu-library structures" >&5
++echo "$as_me:15081: checking if you want opaque menu-library structures" >&5
+ echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -15057,10 +15088,10 @@
+ else
+   enable_opaque_menu=no
+ fi;
+-echo "$as_me:15060: result: $enable_opaque_menu" >&5
++echo "$as_me:15091: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:15063: checking if you want opaque panel-library structures" >&5
++echo "$as_me:15094: checking if you want opaque panel-library structures" >&5
+ echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -15070,7 +15101,7 @@
+ else
+   enable_opaque_panel=no
+ fi;
+-echo "$as_me:15073: result: $enable_opaque_panel" >&5
++echo "$as_me:15104: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -15080,7 +15111,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15083: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15114: checking for prefix used to wrap public variables" >&5
+ echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
+ 
+ # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
+@@ -15090,7 +15121,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15093: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15124: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15103,7 +15134,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15106: checking if you want all development code" >&5
++echo "$as_me:15137: 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.
+@@ -15113,11 +15144,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15116: result: $with_develop" >&5
++echo "$as_me:15147: 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:15120: checking if you want hard-tabs code" >&5
++echo "$as_me:15151: 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.
+@@ -15127,7 +15158,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:15130: result: $enable_hard_tabs" >&5
++echo "$as_me:15161: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15135,7 +15166,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:15138: checking if you want limited support for xmc" >&5
++echo "$as_me:15169: 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.
+@@ -15145,7 +15176,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:15148: result: $enable_xmc_glitch" >&5
++echo "$as_me:15179: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15155,7 +15186,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:15158: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15189: 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.
+@@ -15165,7 +15196,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:15168: result: $with_assumed_color" >&5
++echo "$as_me:15199: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15173,7 +15204,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:15176: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:15207: 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.
+@@ -15183,7 +15214,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:15186: result: $with_hashmap" >&5
++echo "$as_me:15217: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15191,7 +15222,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:15194: checking if you want colorfgbg code" >&5
++echo "$as_me:15225: 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.
+@@ -15201,7 +15232,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:15204: result: $with_colorfgbg" >&5
++echo "$as_me:15235: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15209,7 +15240,7 @@
+ EOF
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:15212: checking if you want interop bindings" >&5
++echo "$as_me:15243: checking if you want interop bindings" >&5
+ echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
+ 
+ # Check whether --enable-interop or --disable-interop was given.
+@@ -15219,13 +15250,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:15222: result: $with_exp_interop" >&5
++echo "$as_me:15253: result: $with_exp_interop" >&5
+ echo "${ECHO_T}$with_exp_interop" >&6
+ 
+ NCURSES_INTEROP_FUNCS=0
+ test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
+ 
+-echo "$as_me:15228: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:15259: 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.
+@@ -15235,13 +15266,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:15238: result: $with_safe_sprintf" >&5
++echo "$as_me:15269: result: $with_safe_sprintf" >&5
+ echo "${ECHO_T}$with_safe_sprintf" >&6
+ 
+ ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
+ # when hashmap is used scroll hints are useless
+ if test "$with_hashmap" = no ; then
+-echo "$as_me:15244: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:15275: 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.
+@@ -15251,7 +15282,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:15254: result: $with_scroll_hints" >&5
++echo "$as_me:15285: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15260,7 +15291,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15263: checking if you want wgetch-events code" >&5
++echo "$as_me:15294: checking if you want wgetch-events code" >&5
+ echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
+ 
+ # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
+@@ -15270,7 +15301,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:15273: result: $with_wgetch_events" >&5
++echo "$as_me:15304: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ test "x$with_wgetch_events" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15281,7 +15312,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15284: checking if you want to see long compiling messages" >&5
++echo "$as_me:15315: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -15315,7 +15346,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:15318: result: $enableval" >&5
++echo "$as_me:15349: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -15328,7 +15359,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:15331: checking if you want to install stripped executables" >&5
++echo "$as_me:15362: checking if you want to install stripped executables" >&5
+ echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
+ 
+ # Check whether --enable-stripping or --disable-stripping was given.
+@@ -15345,7 +15376,7 @@
+ 	with_stripping=yes
+ 
+ fi;
+-echo "$as_me:15348: result: $with_stripping" >&5
++echo "$as_me:15379: result: $with_stripping" >&5
+ echo "${ECHO_T}$with_stripping" >&6
+ 
+ if test "$with_stripping" = yes
+@@ -15356,7 +15387,7 @@
+ fi
+ 
+ : ${INSTALL:=install}
+-echo "$as_me:15359: checking if install accepts -p option" >&5
++echo "$as_me:15390: checking if install accepts -p option" >&5
+ echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
+ if test "${cf_cv_install_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15387,10 +15418,10 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:15390: result: $cf_cv_install_p" >&5
++echo "$as_me:15421: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:15393: checking if install needs to be told about ownership" >&5
++echo "$as_me:15424: checking if install needs to be told about ownership" >&5
+ echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
+ case `$ac_config_guess` in
+ (*minix)
+@@ -15401,7 +15432,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15404: result: $with_install_o" >&5
++echo "$as_me:15435: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -15425,7 +15456,7 @@
+ fi
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:15428: checking if you want to see compiler warnings" >&5
++echo "$as_me:15459: 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.
+@@ -15433,7 +15464,7 @@
+   enableval="$enable_warnings"
+   with_warnings=$enableval
+ fi;
+-echo "$as_me:15436: result: $with_warnings" >&5
++echo "$as_me:15467: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ 
+ if test "x$with_warnings" = "xyes"; then
+@@ -15459,7 +15490,7 @@
+ done
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15462 "configure"
++#line 15493 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15474,26 +15505,26 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15477: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15508: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15480: \$? = $ac_status" >&5
++  echo "$as_me:15511: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15483: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15514: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15486: \$? = $ac_status" >&5
++  echo "$as_me:15517: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-echo "$as_me:15489: checking for X11/Xt const-feature" >&5
++echo "$as_me:15520: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15496 "configure"
++#line 15527 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -15510,16 +15541,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15513: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15544: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15516: \$? = $ac_status" >&5
++  echo "$as_me:15547: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15550: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15522: \$? = $ac_status" >&5
++  echo "$as_me:15553: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -15534,7 +15565,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:15537: result: $cf_cv_const_x_string" >&5
++echo "$as_me:15568: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -15563,7 +15594,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+  fi
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:15613: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -15595,12 +15626,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15598: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15629: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15601: \$? = $ac_status" >&5
++  echo "$as_me:15632: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15603: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15634: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -15608,7 +15639,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:15611: checking for $CC warning options..." >&5
++	{ echo "$as_me:15642: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -15632,12 +15663,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15635: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15666: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15638: \$? = $ac_status" >&5
++  echo "$as_me:15669: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15640: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15671: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Winline)
+@@ -15645,7 +15676,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15648: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15679: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15655,7 +15686,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15658: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15689: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15675,12 +15706,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:15678: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:15709: 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 15683 "configure"
++#line 15714 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15697,16 +15728,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15700: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15731: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15703: \$? = $ac_status" >&5
++  echo "$as_me:15734: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15709: \$? = $ac_status" >&5
++  echo "$as_me:15740: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -15717,7 +15748,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:15720: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:15751: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -15726,12 +15757,12 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:15729: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:15760: checking if this is really Clang C++ compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
+ 	cf_save_CFLAGS="$CXXFLAGS"
+ 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15734 "configure"
++#line 15765 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15748,16 +15779,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15782: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15754: \$? = $ac_status" >&5
++  echo "$as_me:15785: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15760: \$? = $ac_status" >&5
++  echo "$as_me:15791: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -15768,7 +15799,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:15771: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:15802: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -15780,7 +15811,7 @@
+ ac_main_return=return
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:15832: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -15815,12 +15846,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15818: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15849: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15821: \$? = $ac_status" >&5
++  echo "$as_me:15852: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15823: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15854: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -15829,7 +15860,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:15832: checking for $CXX warning options..." >&5
++	{ echo "$as_me:15863: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -15859,16 +15890,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:15862: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15893: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15865: \$? = $ac_status" >&5
++  echo "$as_me:15896: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15867: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15898: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:15871: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15902: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -15904,10 +15935,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:15907: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:15938: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:15990: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15962: \$? = $ac_status" >&5
++  echo "$as_me:15993: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15964: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:15995: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -16020,7 +16051,7 @@
+ rm -rf conftest*
+ fi
+ 
+-echo "$as_me:16023: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:16054: checking if you want to work around bogus compiler/loader warnings" >&5
+ echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-string-hacks or --disable-string-hacks was given.
+@@ -16030,7 +16061,7 @@
+ else
+   with_string_hacks=no
+ fi;
+-echo "$as_me:16033: result: $with_string_hacks" >&5
++echo "$as_me:16064: result: $with_string_hacks" >&5
+ echo "${ECHO_T}$with_string_hacks" >&6
+ 
+ if test "x$with_string_hacks" = "xyes"; then
+@@ -16039,15 +16070,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:16042: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:16073: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+ echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
+-	echo "$as_me:16044: checking for strlcat" >&5
++	echo "$as_me:16075: checking for strlcat" >&5
+ echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
+ if test "${ac_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16050 "configure"
++#line 16081 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16078,16 +16109,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16081: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16112: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16084: \$? = $ac_status" >&5
++  echo "$as_me:16115: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16087: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16118: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16090: \$? = $ac_status" >&5
++  echo "$as_me:16121: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -16097,7 +16128,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16100: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:16131: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
+ 
+@@ -16107,7 +16138,7 @@
+ 
+ else
+ 
+-		echo "$as_me:16110: checking for strlcat in -lbsd" >&5
++		echo "$as_me:16141: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16115,7 +16146,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16118 "configure"
++#line 16149 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16134,16 +16165,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16137: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16140: \$? = $ac_status" >&5
++  echo "$as_me:16171: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16146: \$? = $ac_status" >&5
++  echo "$as_me:16177: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -16154,7 +16185,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16157: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:16188: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test $ac_cv_lib_bsd_strlcat = yes; then
+ 
+@@ -16177,23 +16208,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16180: checking for $ac_header" >&5
++echo "$as_me:16211: 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 16186 "configure"
++#line 16217 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:16190: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16221: \"$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:16196: \$? = $ac_status" >&5
++  echo "$as_me:16227: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16212,7 +16243,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16215: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:16246: 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 <&5
++echo "$as_me:16267: 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 16242 "configure"
++#line 16273 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16270,16 +16301,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16273: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16304: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16276: \$? = $ac_status" >&5
++  echo "$as_me:16307: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16279: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16310: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16282: \$? = $ac_status" >&5
++  echo "$as_me:16313: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -16289,7 +16320,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16292: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:16323: 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 <&5
++echo "$as_me:16336: 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.
+@@ -16312,7 +16343,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:16315: result: $with_assertions" >&5
++echo "$as_me:16346: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16328,7 +16359,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:16331: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:16362: 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.
+@@ -16345,7 +16376,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:16348: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:16379: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16459,23 +16490,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:16462: checking for dmalloc.h" >&5
++	echo "$as_me:16493: 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 16468 "configure"
++#line 16499 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16472: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16503: \"$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:16478: \$? = $ac_status" >&5
++  echo "$as_me:16509: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16494,11 +16525,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16497: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:16528: 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:16501: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:16532: 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
+@@ -16506,7 +16537,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16509 "configure"
++#line 16540 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16525,16 +16556,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16559: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16531: \$? = $ac_status" >&5
++  echo "$as_me:16562: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16565: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16537: \$? = $ac_status" >&5
++  echo "$as_me:16568: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -16545,7 +16576,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16548: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:16579: 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 <&5
++echo "$as_me:16594: 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.
+@@ -16577,7 +16608,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:16580: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:16611: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16691,23 +16722,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:16694: checking for dbmalloc.h" >&5
++	echo "$as_me:16725: 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 16700 "configure"
++#line 16731 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16704: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16735: \"$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:16710: \$? = $ac_status" >&5
++  echo "$as_me:16741: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16726,11 +16757,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16729: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:16760: 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:16733: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:16764: 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
+@@ -16738,7 +16769,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16741 "configure"
++#line 16772 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16757,16 +16788,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16760: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16791: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16763: \$? = $ac_status" >&5
++  echo "$as_me:16794: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16766: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16797: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16769: \$? = $ac_status" >&5
++  echo "$as_me:16800: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -16777,7 +16808,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16780: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:16811: 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 <&5
++echo "$as_me:16826: 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.
+@@ -16809,7 +16840,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:16812: result: ${with_valgrind:-no}" >&5
++echo "$as_me:16843: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16922,7 +16953,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16925: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:16956: 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.
+@@ -16932,7 +16963,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:16935: result: $with_no_leaks" >&5
++echo "$as_me:16966: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -16984,7 +17015,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16987: checking whether to add trace feature to all models" >&5
++echo "$as_me:17018: 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.
+@@ -16994,7 +17025,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16997: result: $cf_with_trace" >&5
++echo "$as_me:17028: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -17108,7 +17139,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:17111: checking if we want to use GNAT projects" >&5
++echo "$as_me:17142: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -17125,7 +17156,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:17128: result: $enable_gnat_projects" >&5
++echo "$as_me:17159: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -17135,13 +17166,13 @@
+ 	# Note: WINVER may be a problem with Windows 10
+ 	;;
+ (*)
+-echo "$as_me:17138: checking for gettimeofday" >&5
++echo "$as_me:17169: 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 17144 "configure"
++#line 17175 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17172,16 +17203,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17175: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17206: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17178: \$? = $ac_status" >&5
++  echo "$as_me:17209: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17181: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17212: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17184: \$? = $ac_status" >&5
++  echo "$as_me:17215: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -17191,7 +17222,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17194: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17225: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test $ac_cv_func_gettimeofday = yes; then
+ 
+@@ -17201,7 +17232,7 @@
+ 
+ else
+ 
+-echo "$as_me:17204: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17235: 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
+@@ -17209,7 +17240,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17212 "configure"
++#line 17243 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17228,16 +17259,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17231: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17262: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17234: \$? = $ac_status" >&5
++  echo "$as_me:17265: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17237: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17240: \$? = $ac_status" >&5
++  echo "$as_me:17271: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17248,7 +17279,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17251: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17282: 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
+ 
+@@ -17278,14 +17309,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17281: checking if -lm needed for math functions" >&5
++echo "$as_me:17312: 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 17288 "configure"
++#line 17319 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -17301,16 +17332,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17304: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17335: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17307: \$? = $ac_status" >&5
++  echo "$as_me:17338: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17341: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17313: \$? = $ac_status" >&5
++  echo "$as_me:17344: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -17320,7 +17351,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17323: result: $cf_cv_need_libm" >&5
++echo "$as_me:17354: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -17328,13 +17359,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:17331: checking for ANSI C header files" >&5
++echo "$as_me:17362: 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 17337 "configure"
++#line 17368 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17342,13 +17373,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:17345: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17376: \"$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:17351: \$? = $ac_status" >&5
++  echo "$as_me:17382: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17370,7 +17401,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 17373 "configure"
++#line 17404 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17388,7 +17419,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 17391 "configure"
++#line 17422 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17409,7 +17440,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17412 "configure"
++#line 17443 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -17435,15 +17466,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17438: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17469: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17441: \$? = $ac_status" >&5
++  echo "$as_me:17472: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17443: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17446: \$? = $ac_status" >&5
++  echo "$as_me:17477: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -17456,7 +17487,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:17459: result: $ac_cv_header_stdc" >&5
++echo "$as_me:17490: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -17469,13 +17500,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:17472: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:17503: 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 17478 "configure"
++#line 17509 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17490,16 +17521,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17493: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17496: \$? = $ac_status" >&5
++  echo "$as_me:17527: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17499: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17502: \$? = $ac_status" >&5
++  echo "$as_me:17533: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17509,7 +17540,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17512: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17543: 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 <&5
++  echo "$as_me:17556: 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
+@@ -17530,7 +17561,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17533 "configure"
++#line 17564 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17549,16 +17580,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17552: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17583: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17555: \$? = $ac_status" >&5
++  echo "$as_me:17586: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17561: \$? = $ac_status" >&5
++  echo "$as_me:17592: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17569,14 +17600,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17572: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17603: 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:17579: checking for opendir in -lx" >&5
++  echo "$as_me:17610: 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
+@@ -17584,7 +17615,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17587 "configure"
++#line 17618 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17603,16 +17634,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17606: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17637: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17609: \$? = $ac_status" >&5
++  echo "$as_me:17640: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17615: \$? = $ac_status" >&5
++  echo "$as_me:17646: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17623,7 +17654,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17626: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17657: 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"
+@@ -17631,13 +17662,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17634: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17665: 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 17640 "configure"
++#line 17671 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17653,16 +17684,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17687: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17659: \$? = $ac_status" >&5
++  echo "$as_me:17690: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17693: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17665: \$? = $ac_status" >&5
++  echo "$as_me:17696: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17672,7 +17703,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17675: result: $ac_cv_header_time" >&5
++echo "$as_me:17706: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17691,13 +17722,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17694: checking for regcomp" >&5
++echo "$as_me:17725: checking for regcomp" >&5
+ echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
+ if test "${ac_cv_func_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17700 "configure"
++#line 17731 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17728,16 +17759,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17731: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17762: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17734: \$? = $ac_status" >&5
++  echo "$as_me:17765: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17740: \$? = $ac_status" >&5
++  echo "$as_me:17771: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -17747,7 +17778,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17750: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:17781: result: $ac_cv_func_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_func_regcomp" >&6
+ if test $ac_cv_func_regcomp = yes; then
+   cf_regex_func=regcomp
+@@ -17756,7 +17787,7 @@
+ 	for cf_regex_lib in $cf_regex_libs
+ 	do
+ 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
+-echo "$as_me:17759: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:17790: checking for regcomp in -l$cf_regex_lib" >&5
+ echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17764,7 +17795,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17767 "configure"
++#line 17798 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17783,16 +17814,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17786: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17817: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17789: \$? = $ac_status" >&5
++  echo "$as_me:17820: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17795: \$? = $ac_status" >&5
++  echo "$as_me:17826: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17803,7 +17834,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17806: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:17837: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -17832,13 +17863,13 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:17835: checking for compile" >&5
++	echo "$as_me:17866: checking for compile" >&5
+ echo $ECHO_N "checking for compile... $ECHO_C" >&6
+ if test "${ac_cv_func_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17841 "configure"
++#line 17872 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17869,16 +17900,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17872: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17875: \$? = $ac_status" >&5
++  echo "$as_me:17906: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17881: \$? = $ac_status" >&5
++  echo "$as_me:17912: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -17888,13 +17919,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17891: result: $ac_cv_func_compile" >&5
++echo "$as_me:17922: result: $ac_cv_func_compile" >&5
+ echo "${ECHO_T}$ac_cv_func_compile" >&6
+ if test $ac_cv_func_compile = yes; then
+   cf_regex_func=compile
+ else
+ 
+-		echo "$as_me:17897: checking for compile in -lgen" >&5
++		echo "$as_me:17928: checking for compile in -lgen" >&5
+ echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
+ if test "${ac_cv_lib_gen_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17902,7 +17933,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17905 "configure"
++#line 17936 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17921,16 +17952,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17955: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17927: \$? = $ac_status" >&5
++  echo "$as_me:17958: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17933: \$? = $ac_status" >&5
++  echo "$as_me:17964: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -17941,7 +17972,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17944: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:17975: result: $ac_cv_lib_gen_compile" >&5
+ echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
+ if test $ac_cv_lib_gen_compile = yes; then
+ 
+@@ -17969,11 +18000,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:17972: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:18003: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:17976: checking for regular-expression headers" >&5
++echo "$as_me:18007: checking for regular-expression headers" >&5
+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
+ if test "${cf_cv_regex_hdrs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17985,7 +18016,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17988 "configure"
++#line 18019 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -18000,16 +18031,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18003: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18034: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18006: \$? = $ac_status" >&5
++  echo "$as_me:18037: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18012: \$? = $ac_status" >&5
++  echo "$as_me:18043: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -18026,7 +18057,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18029 "configure"
++#line 18060 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -18044,16 +18075,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18078: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18050: \$? = $ac_status" >&5
++  echo "$as_me:18081: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18056: \$? = $ac_status" >&5
++  echo "$as_me:18087: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -18069,11 +18100,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:18072: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:18103: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case $cf_cv_regex_hdrs in
+-	(no)		{ echo "$as_me:18076: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:18107: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -18112,23 +18143,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18115: checking for $ac_header" >&5
++echo "$as_me:18146: 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 18121 "configure"
++#line 18152 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18125: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18156: \"$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:18131: \$? = $ac_status" >&5
++  echo "$as_me:18162: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18147,7 +18178,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:18150: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18181: 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 <&5
++echo "$as_me:18194: 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 18169 "configure"
++#line 18200 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18173: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18204: \"$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:18179: \$? = $ac_status" >&5
++  echo "$as_me:18210: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18195,7 +18226,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:18198: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18229: 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 <&5
++echo "$as_me:18239: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18215,7 +18246,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18218 "configure"
++#line 18249 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18228,16 +18259,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18231: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18262: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18234: \$? = $ac_status" >&5
++  echo "$as_me:18265: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18237: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18240: \$? = $ac_status" >&5
++  echo "$as_me:18271: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -18249,7 +18280,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18252: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18283: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -18266,14 +18297,14 @@
+ 
+ fi
+ 
+-echo "$as_me:18269: checking if external environ is declared" >&5
++echo "$as_me:18300: checking if external environ is declared" >&5
+ echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 18276 "configure"
++#line 18307 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -18289,16 +18320,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18292: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18323: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18295: \$? = $ac_status" >&5
++  echo "$as_me:18326: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18298: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18301: \$? = $ac_status" >&5
++  echo "$as_me:18332: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -18309,7 +18340,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18312: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:18343: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -18324,14 +18355,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:18327: checking if external environ exists" >&5
++echo "$as_me:18358: checking if external environ exists" >&5
+ echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
+ if test "${cf_cv_have_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18334 "configure"
++#line 18365 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -18346,16 +18377,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18380: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18352: \$? = $ac_status" >&5
++  echo "$as_me:18383: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18386: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18358: \$? = $ac_status" >&5
++  echo "$as_me:18389: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -18366,7 +18397,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18369: result: $cf_cv_have_environ" >&5
++echo "$as_me:18400: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -18379,13 +18410,13 @@
+ 
+ fi
+ 
+-echo "$as_me:18382: checking for getenv" >&5
++echo "$as_me:18413: checking for getenv" >&5
+ echo $ECHO_N "checking for getenv... $ECHO_C" >&6
+ if test "${ac_cv_func_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18388 "configure"
++#line 18419 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18416,16 +18447,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18419: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18450: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18422: \$? = $ac_status" >&5
++  echo "$as_me:18453: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18456: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18428: \$? = $ac_status" >&5
++  echo "$as_me:18459: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -18435,19 +18466,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18438: result: $ac_cv_func_getenv" >&5
++echo "$as_me:18469: result: $ac_cv_func_getenv" >&5
+ echo "${ECHO_T}$ac_cv_func_getenv" >&6
+ 
+ for ac_func in putenv setenv strdup
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18444: checking for $ac_func" >&5
++echo "$as_me:18475: 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 18450 "configure"
++#line 18481 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18478,16 +18509,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18481: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18484: \$? = $ac_status" >&5
++  echo "$as_me:18515: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18487: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18490: \$? = $ac_status" >&5
++  echo "$as_me:18521: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18497,7 +18528,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18500: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18531: 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 <&5
++echo "$as_me:18541: checking if getenv returns consistent values" >&5
+ echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
+ if test "${cf_cv_consistent_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18517,7 +18548,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18520 "configure"
++#line 18551 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18626,15 +18657,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18629: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18660: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18632: \$? = $ac_status" >&5
++  echo "$as_me:18663: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18634: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18637: \$? = $ac_status" >&5
++  echo "$as_me:18668: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -18647,7 +18678,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:18650: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:18681: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -18662,7 +18693,7 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:18665: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:18696: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+ echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
+ fi
+ 
+@@ -18670,7 +18701,7 @@
+ # Note: even non-Posix ISC needs  to declare fd_set
+ if test "x$ISC" = xyes ; then
+ 
+-echo "$as_me:18673: checking for main in -lcposix" >&5
++echo "$as_me:18704: 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
+@@ -18678,7 +18709,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18681 "configure"
++#line 18712 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18690,16 +18721,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18693: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18724: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18696: \$? = $ac_status" >&5
++  echo "$as_me:18727: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18699: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18730: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18702: \$? = $ac_status" >&5
++  echo "$as_me:18733: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cposix_main=yes
+ else
+@@ -18710,7 +18741,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18713: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:18744: 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 <&5
++	echo "$as_me:18755: 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
+@@ -18729,7 +18760,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18732 "configure"
++#line 18763 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18748,16 +18779,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18751: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18782: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18754: \$? = $ac_status" >&5
++  echo "$as_me:18785: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18760: \$? = $ac_status" >&5
++  echo "$as_me:18791: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_inet_bzero=yes
+ else
+@@ -18768,7 +18799,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18771: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:18802: 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
+ 
+@@ -18791,14 +18822,14 @@
+ fi
+ fi
+ 
+-echo "$as_me:18794: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:18825: 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 18801 "configure"
++#line 18832 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18818,16 +18849,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18821: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18852: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18824: \$? = $ac_status" >&5
++  echo "$as_me:18855: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18858: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18830: \$? = $ac_status" >&5
++  echo "$as_me:18861: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -18839,7 +18870,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18842: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:18873: 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
+@@ -18854,13 +18885,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:18857: checking for an ANSI C-conforming const" >&5
++echo "$as_me:18888: 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 18863 "configure"
++#line 18894 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18918,16 +18949,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18921: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18952: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18924: \$? = $ac_status" >&5
++  echo "$as_me:18955: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18927: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18958: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18930: \$? = $ac_status" >&5
++  echo "$as_me:18961: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -18937,7 +18968,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:18940: result: $ac_cv_c_const" >&5
++echo "$as_me:18971: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -18947,7 +18978,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18950: checking for inline" >&5
++echo "$as_me:18981: 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
+@@ -18955,7 +18986,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18958 "configure"
++#line 18989 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -18964,16 +18995,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18967: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18998: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18970: \$? = $ac_status" >&5
++  echo "$as_me:19001: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18973: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19004: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18976: \$? = $ac_status" >&5
++  echo "$as_me:19007: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -18984,7 +19015,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18987: result: $ac_cv_c_inline" >&5
++echo "$as_me:19018: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -19010,7 +19041,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:19013: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:19044: checking if $CC supports options to tune inlining" >&5
+ echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
+ if test "${cf_cv_gcc_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19019,7 +19050,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 19022 "configure"
++#line 19053 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -19031,16 +19062,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19034: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19065: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19037: \$? = $ac_status" >&5
++  echo "$as_me:19068: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19040: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19071: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19043: \$? = $ac_status" >&5
++  echo "$as_me:19074: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -19052,7 +19083,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:19055: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:19086: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -19158,7 +19189,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:19161: checking for signal global datatype" >&5
++echo "$as_me:19192: 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
+@@ -19170,7 +19201,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19173 "configure"
++#line 19204 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19193,16 +19224,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19227: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19199: \$? = $ac_status" >&5
++  echo "$as_me:19230: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19205: \$? = $ac_status" >&5
++  echo "$as_me:19236: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -19216,7 +19247,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19219: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:19250: 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 <&5
++echo "$as_me:19259: 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
+@@ -19235,7 +19266,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19238 "configure"
++#line 19269 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -19270,15 +19301,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19273: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19304: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19276: \$? = $ac_status" >&5
++  echo "$as_me:19307: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19278: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19309: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19281: \$? = $ac_status" >&5
++  echo "$as_me:19312: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -19293,7 +19324,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19296: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:19327: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:19339: 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 19315 "configure"
++#line 19346 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -19324,16 +19355,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19327: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19358: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19330: \$? = $ac_status" >&5
++  echo "$as_me:19361: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19333: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19364: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19336: \$? = $ac_status" >&5
++  echo "$as_me:19367: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -19345,7 +19376,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19348: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:19379: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -19361,14 +19392,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:19364: checking if external errno is declared" >&5
++echo "$as_me:19395: 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 19371 "configure"
++#line 19402 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -19386,16 +19417,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19420: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19392: \$? = $ac_status" >&5
++  echo "$as_me:19423: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19398: \$? = $ac_status" >&5
++  echo "$as_me:19429: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -19406,7 +19437,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19409: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:19440: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -19421,14 +19452,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:19424: checking if external errno exists" >&5
++echo "$as_me:19455: 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 19431 "configure"
++#line 19462 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -19443,16 +19474,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19446: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19477: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19449: \$? = $ac_status" >&5
++  echo "$as_me:19480: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19483: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19455: \$? = $ac_status" >&5
++  echo "$as_me:19486: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -19463,7 +19494,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19466: result: $cf_cv_have_errno" >&5
++echo "$as_me:19497: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -19476,7 +19507,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19479: checking if data-only library module links" >&5
++echo "$as_me:19510: 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
+@@ -19484,20 +19515,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:19521: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19493: \$? = $ac_status" >&5
++  echo "$as_me:19524: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:19544: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19516: \$? = $ac_status" >&5
++  echo "$as_me:19547: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -19526,7 +19557,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19529 "configure"
++#line 19560 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -19537,15 +19568,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19540: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19571: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19543: \$? = $ac_status" >&5
++  echo "$as_me:19574: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19548: \$? = $ac_status" >&5
++  echo "$as_me:19579: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -19560,7 +19591,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19563: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:19594: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -19602,13 +19633,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19605: checking for $ac_func" >&5
++echo "$as_me:19636: 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 19611 "configure"
++#line 19642 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19639,16 +19670,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19642: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19673: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19645: \$? = $ac_status" >&5
++  echo "$as_me:19676: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19679: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19651: \$? = $ac_status" >&5
++  echo "$as_me:19682: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19658,7 +19689,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:19661: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:19692: 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 <&5
++	{ { echo "$as_me:19704: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19679,7 +19710,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:19682: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:19713: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -19692,14 +19723,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:19695: checking for terminal-capability database functions" >&5
++echo "$as_me:19726: 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 19702 "configure"
++#line 19733 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19719,16 +19750,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19722: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19753: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19725: \$? = $ac_status" >&5
++  echo "$as_me:19756: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19728: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19759: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19731: \$? = $ac_status" >&5
++  echo "$as_me:19762: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -19739,7 +19770,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19742: result: $cf_cv_cgetent" >&5
++echo "$as_me:19773: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -19749,14 +19780,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:19752: checking if cgetent uses const parameter" >&5
++echo "$as_me:19783: checking if cgetent uses const parameter" >&5
+ echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
+ if test "${cf_cv_cgetent_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19759 "configure"
++#line 19790 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -19779,16 +19810,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19782: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19813: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19785: \$? = $ac_status" >&5
++  echo "$as_me:19816: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19819: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19791: \$? = $ac_status" >&5
++  echo "$as_me:19822: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -19799,7 +19830,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19802: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:19833: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -19813,14 +19844,14 @@
+ 
+ fi
+ 
+-echo "$as_me:19816: checking for isascii" >&5
++echo "$as_me:19847: 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 19823 "configure"
++#line 19854 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -19832,16 +19863,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19835: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19866: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19838: \$? = $ac_status" >&5
++  echo "$as_me:19869: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19872: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19844: \$? = $ac_status" >&5
++  echo "$as_me:19875: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -19852,7 +19883,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19855: result: $cf_cv_have_isascii" >&5
++echo "$as_me:19886: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -19860,10 +19891,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:19863: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:19894: 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 19866 "configure"
++#line 19897 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19877,16 +19908,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19880: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19911: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19883: \$? = $ac_status" >&5
++  echo "$as_me:19914: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19886: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19917: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19889: \$? = $ac_status" >&5
++  echo "$as_me:19920: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=no
+ else
+@@ -19894,7 +19925,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19897 "configure"
++#line 19928 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -19909,16 +19940,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19912: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19943: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19915: \$? = $ac_status" >&5
++  echo "$as_me:19946: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19918: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19949: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19921: \$? = $ac_status" >&5
++  echo "$as_me:19952: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=yes
+ 
+@@ -19934,11 +19965,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19937: result: $sigact_bad" >&5
++echo "$as_me:19968: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:19941: checking if nanosleep really works" >&5
++echo "$as_me:19972: 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
+@@ -19948,7 +19979,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19951 "configure"
++#line 19982 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19973,15 +20004,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19976: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20007: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19979: \$? = $ac_status" >&5
++  echo "$as_me:20010: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19981: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19984: \$? = $ac_status" >&5
++  echo "$as_me:20015: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -19993,7 +20024,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:19996: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:20027: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -20010,23 +20041,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20013: checking for $ac_header" >&5
++echo "$as_me:20044: 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 20019 "configure"
++#line 20050 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20023: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20054: \"$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:20029: \$? = $ac_status" >&5
++  echo "$as_me:20060: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20045,7 +20076,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20048: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20079: 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 <&5
++	echo "$as_me:20096: 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 20068 "configure"
++#line 20099 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -20077,16 +20108,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20080: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20111: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20083: \$? = $ac_status" >&5
++  echo "$as_me:20114: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20086: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20089: \$? = $ac_status" >&5
++  echo "$as_me:20120: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=no
+ else
+@@ -20094,7 +20125,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 20097 "configure"
++#line 20128 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -20108,16 +20139,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20111: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20142: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20114: \$? = $ac_status" >&5
++  echo "$as_me:20145: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20148: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20120: \$? = $ac_status" >&5
++  echo "$as_me:20151: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=unknown
+ else
+@@ -20133,19 +20164,19 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:20136: result: $termios_bad" >&5
++	echo "$as_me:20167: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:20141: checking for tcgetattr" >&5
++echo "$as_me:20172: 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 20148 "configure"
++#line 20179 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20173,16 +20204,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20176: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20207: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20179: \$? = $ac_status" >&5
++  echo "$as_me:20210: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20185: \$? = $ac_status" >&5
++  echo "$as_me:20216: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -20192,21 +20223,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20195: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:20226: 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:20202: checking for vsscanf function or workaround" >&5
++echo "$as_me:20233: 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 20209 "configure"
++#line 20240 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20222,16 +20253,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20225: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20256: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20228: \$? = $ac_status" >&5
++  echo "$as_me:20259: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20231: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20234: \$? = $ac_status" >&5
++  echo "$as_me:20265: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -20239,7 +20270,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20242 "configure"
++#line 20273 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20261,16 +20292,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20295: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20267: \$? = $ac_status" >&5
++  echo "$as_me:20298: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20301: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20273: \$? = $ac_status" >&5
++  echo "$as_me:20304: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -20278,7 +20309,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20281 "configure"
++#line 20312 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20300,16 +20331,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20303: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20334: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20306: \$? = $ac_status" >&5
++  echo "$as_me:20337: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20309: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20340: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20312: \$? = $ac_status" >&5
++  echo "$as_me:20343: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -20324,7 +20355,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20327: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:20358: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case $cf_cv_func_vsscanf in
+@@ -20350,23 +20381,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20353: checking for $ac_header" >&5
++echo "$as_me:20384: 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 20359 "configure"
++#line 20390 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20363: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20394: \"$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:20369: \$? = $ac_status" >&5
++  echo "$as_me:20400: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20385,7 +20416,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20388: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20419: 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 <&5
++echo "$as_me:20429: 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
+@@ -20406,7 +20437,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20409 "configure"
++#line 20440 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20447,15 +20478,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20450: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20481: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20453: \$? = $ac_status" >&5
++  echo "$as_me:20484: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20486: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20458: \$? = $ac_status" >&5
++  echo "$as_me:20489: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -20470,16 +20501,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:20473: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:20504: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:20476: checking for mkstemp" >&5
++	echo "$as_me:20507: 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 20482 "configure"
++#line 20513 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20510,16 +20541,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20513: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20544: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20516: \$? = $ac_status" >&5
++  echo "$as_me:20547: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20550: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20522: \$? = $ac_status" >&5
++  echo "$as_me:20553: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -20529,7 +20560,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20532: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:20563: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -20550,21 +20581,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:20553: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:20584: 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:20556: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:20587: 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:20562: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:20593: 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 20567 "configure"
++#line 20598 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -20581,15 +20612,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20584: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20615: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20587: \$? = $ac_status" >&5
++  echo "$as_me:20618: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20620: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20592: \$? = $ac_status" >&5
++  echo "$as_me:20623: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -20602,7 +20633,7 @@
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:20605: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:20636: 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
+ 
+@@ -20613,13 +20644,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:20616: checking for intptr_t" >&5
++echo "$as_me:20647: checking for intptr_t" >&5
+ echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
+ if test "${ac_cv_type_intptr_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20622 "configure"
++#line 20653 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -20634,16 +20665,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20637: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20668: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20640: \$? = $ac_status" >&5
++  echo "$as_me:20671: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20646: \$? = $ac_status" >&5
++  echo "$as_me:20677: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -20653,7 +20684,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:20656: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:20687: result: $ac_cv_type_intptr_t" >&5
+ echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
+ if test $ac_cv_type_intptr_t = yes; then
+   :
+@@ -20665,13 +20696,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20668: checking for ssize_t" >&5
++echo "$as_me:20699: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20674 "configure"
++#line 20705 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -20686,16 +20717,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20720: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20692: \$? = $ac_status" >&5
++  echo "$as_me:20723: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20726: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20698: \$? = $ac_status" >&5
++  echo "$as_me:20729: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -20705,7 +20736,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:20708: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:20739: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test $ac_cv_type_ssize_t = yes; then
+   :
+@@ -20717,14 +20748,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20720: checking for type sigaction_t" >&5
++echo "$as_me:20751: 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 20727 "configure"
++#line 20758 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20737,16 +20768,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20740: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20743: \$? = $ac_status" >&5
++  echo "$as_me:20774: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20749: \$? = $ac_status" >&5
++  echo "$as_me:20780: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -20757,14 +20788,14 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:20760: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:20791: 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:20767: checking declaration of size-change" >&5
++echo "$as_me:20798: 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
+@@ -20785,7 +20816,7 @@
+ 
+ 	fi
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20788 "configure"
++#line 20819 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -20831,16 +20862,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20834: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20865: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20837: \$? = $ac_status" >&5
++  echo "$as_me:20868: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20840: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20843: \$? = $ac_status" >&5
++  echo "$as_me:20874: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -20859,7 +20890,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20862: result: $cf_cv_sizechange" >&5
++echo "$as_me:20893: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -20877,13 +20908,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:20880: checking for memmove" >&5
++echo "$as_me:20911: 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 20886 "configure"
++#line 20917 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20914,16 +20945,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20917: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20948: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20920: \$? = $ac_status" >&5
++  echo "$as_me:20951: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20923: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20954: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20926: \$? = $ac_status" >&5
++  echo "$as_me:20957: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -20933,19 +20964,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20936: result: $ac_cv_func_memmove" >&5
++echo "$as_me:20967: 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:20942: checking for bcopy" >&5
++echo "$as_me:20973: 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 20948 "configure"
++#line 20979 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20976,16 +21007,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20979: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20982: \$? = $ac_status" >&5
++  echo "$as_me:21013: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20985: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20988: \$? = $ac_status" >&5
++  echo "$as_me:21019: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -20995,11 +21026,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20998: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:21029: 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:21002: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:21033: 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
+@@ -21009,7 +21040,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21012 "configure"
++#line 21043 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -21023,15 +21054,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21026: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21057: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21029: \$? = $ac_status" >&5
++  echo "$as_me:21060: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21062: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21034: \$? = $ac_status" >&5
++  echo "$as_me:21065: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -21044,7 +21075,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21047: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:21078: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -21071,13 +21102,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:21074: checking for $ac_func" >&5
++echo "$as_me:21105: 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 21080 "configure"
++#line 21111 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21108,16 +21139,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21111: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21142: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21114: \$? = $ac_status" >&5
++  echo "$as_me:21145: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21148: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21120: \$? = $ac_status" >&5
++  echo "$as_me:21151: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21127,7 +21158,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21130: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:21161: 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 <&5
++echo "$as_me:21171: 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
+@@ -21147,7 +21178,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21150 "configure"
++#line 21181 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21199,15 +21230,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21202: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21233: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21205: \$? = $ac_status" >&5
++  echo "$as_me:21236: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21207: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21238: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21210: \$? = $ac_status" >&5
++  echo "$as_me:21241: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -21219,21 +21250,21 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21222: result: $cf_cv_working_poll" >&5
++echo "$as_me:21253: result: $cf_cv_working_poll" >&5
+ echo "${ECHO_T}$cf_cv_working_poll" >&6
+ test "$cf_cv_working_poll" = "yes" &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_WORKING_POLL 1
+ EOF
+ 
+-echo "$as_me:21229: checking for va_copy" >&5
++echo "$as_me:21260: checking for va_copy" >&5
+ echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21236 "configure"
++#line 21267 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21250,16 +21281,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21253: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21284: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21256: \$? = $ac_status" >&5
++  echo "$as_me:21287: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21259: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21290: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21262: \$? = $ac_status" >&5
++  echo "$as_me:21293: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -21269,7 +21300,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21272: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:21303: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -21281,14 +21312,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:21284: checking for __va_copy" >&5
++echo "$as_me:21315: checking for __va_copy" >&5
+ echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21291 "configure"
++#line 21322 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21305,16 +21336,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21308: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21311: \$? = $ac_status" >&5
++  echo "$as_me:21342: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21317: \$? = $ac_status" >&5
++  echo "$as_me:21348: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -21324,7 +21355,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21327: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:21358: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -21336,14 +21367,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:21339: checking for __builtin_va_copy" >&5
++echo "$as_me:21370: checking for __builtin_va_copy" >&5
+ echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___builtin_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21346 "configure"
++#line 21377 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21360,16 +21391,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21363: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21394: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21366: \$? = $ac_status" >&5
++  echo "$as_me:21397: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21369: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21400: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21372: \$? = $ac_status" >&5
++  echo "$as_me:21403: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -21379,7 +21410,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21382: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:21413: result: $cf_cv_have___builtin_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
+ 
+ test "$cf_cv_have___builtin_va_copy" = yes &&
+@@ -21397,14 +21428,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:21400: checking if we can simply copy va_list" >&5
++	echo "$as_me:21431: checking if we can simply copy va_list" >&5
+ echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
+ if test "${cf_cv_pointer_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21407 "configure"
++#line 21438 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21421,16 +21452,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21424: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21455: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21427: \$? = $ac_status" >&5
++  echo "$as_me:21458: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21461: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21433: \$? = $ac_status" >&5
++  echo "$as_me:21464: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -21440,19 +21471,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21443: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:21474: result: $cf_cv_pointer_va_list" >&5
+ echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
+ 
+ 	if test "$cf_cv_pointer_va_list" = no
+ 	then
+-		echo "$as_me:21448: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:21479: checking if we can copy va_list indirectly" >&5
+ echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
+ if test "${cf_cv_array_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21455 "configure"
++#line 21486 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21469,16 +21500,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21472: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21503: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21475: \$? = $ac_status" >&5
++  echo "$as_me:21506: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21509: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21481: \$? = $ac_status" >&5
++  echo "$as_me:21512: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -21488,7 +21519,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21491: result: $cf_cv_array_va_list" >&5
++echo "$as_me:21522: result: $cf_cv_array_va_list" >&5
+ echo "${ECHO_T}$cf_cv_array_va_list" >&6
+ 		test "$cf_cv_array_va_list" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21499,13 +21530,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:21502: checking for pid_t" >&5
++echo "$as_me:21533: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21508 "configure"
++#line 21539 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21520,16 +21551,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21523: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21554: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21526: \$? = $ac_status" >&5
++  echo "$as_me:21557: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21560: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21532: \$? = $ac_status" >&5
++  echo "$as_me:21563: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -21539,7 +21570,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:21542: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:21573: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+   :
+@@ -21554,23 +21585,23 @@
+ for ac_header in unistd.h vfork.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:21557: checking for $ac_header" >&5
++echo "$as_me:21588: 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 21563 "configure"
++#line 21594 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:21567: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:21598: \"$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:21573: \$? = $ac_status" >&5
++  echo "$as_me:21604: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21589,7 +21620,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:21592: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:21623: 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 <&5
++echo "$as_me:21636: 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 21611 "configure"
++#line 21642 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21639,16 +21670,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21642: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21673: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21645: \$? = $ac_status" >&5
++  echo "$as_me:21676: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21679: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21651: \$? = $ac_status" >&5
++  echo "$as_me:21682: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21658,7 +21689,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21661: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:21692: 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 <&5
++  echo "$as_me:21704: checking for working fork" >&5
+ echo $ECHO_N "checking for working fork... $ECHO_C" >&6
+ if test "${ac_cv_func_fork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21693,15 +21724,15 @@
+       }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21696: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21727: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21699: \$? = $ac_status" >&5
++  echo "$as_me:21730: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21701: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21732: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21704: \$? = $ac_status" >&5
++  echo "$as_me:21735: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -21713,7 +21744,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21716: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:21747: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -21727,12 +21758,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:21730: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:21761: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
+ fi
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ if test "x$ac_cv_func_vfork" = xyes; then
+-  echo "$as_me:21735: checking for working vfork" >&5
++  echo "$as_me:21766: checking for working vfork" >&5
+ echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
+ if test "${ac_cv_func_vfork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21741,7 +21772,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21744 "configure"
++#line 21775 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -21838,15 +21869,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21841: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21872: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21844: \$? = $ac_status" >&5
++  echo "$as_me:21875: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21877: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21849: \$? = $ac_status" >&5
++  echo "$as_me:21880: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -21858,13 +21889,13 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21861: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:21892: result: $ac_cv_func_vfork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+ 
+ fi;
+ if test "x$ac_cv_func_fork_works" = xcross; then
+   ac_cv_func_vfork_works=ac_cv_func_vfork
+-  { echo "$as_me:21867: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:21898: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
+ fi
+ 
+@@ -21889,7 +21920,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21892: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:21923: checking if fopen accepts explicit binary mode" >&5
+ echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
+ if test "${cf_cv_fopen_bin_r+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21899,7 +21930,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21902 "configure"
++#line 21933 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21932,15 +21963,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21935: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21966: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21938: \$? = $ac_status" >&5
++  echo "$as_me:21969: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21971: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21943: \$? = $ac_status" >&5
++  echo "$as_me:21974: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -21953,7 +21984,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21956: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:21987: result: $cf_cv_fopen_bin_r" >&5
+ echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
+ test "x$cf_cv_fopen_bin_r" != xno &&
+ cat >>confdefs.h <<\EOF
+@@ -21962,7 +21993,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:21965: checking for openpty in -lutil" >&5
++echo "$as_me:21996: 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
+@@ -21970,7 +22001,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21973 "configure"
++#line 22004 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21989,16 +22020,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21992: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22023: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21995: \$? = $ac_status" >&5
++  echo "$as_me:22026: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22001: \$? = $ac_status" >&5
++  echo "$as_me:22032: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -22009,7 +22040,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22012: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:22043: 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
+@@ -22017,7 +22048,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:22020: checking for openpty header" >&5
++echo "$as_me:22051: 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
+@@ -22044,7 +22075,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22047 "configure"
++#line 22078 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -22061,16 +22092,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22064: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22095: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22067: \$? = $ac_status" >&5
++  echo "$as_me:22098: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22073: \$? = $ac_status" >&5
++  echo "$as_me:22104: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -22088,7 +22119,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:22091: result: $cf_cv_func_openpty" >&5
++echo "$as_me:22122: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -22161,7 +22192,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 22164 "configure"
++#line 22195 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22173,16 +22204,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22176: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22207: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22179: \$? = $ac_status" >&5
++  echo "$as_me:22210: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22185: \$? = $ac_status" >&5
++  echo "$as_me:22216: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -22199,7 +22230,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:22202: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:22233: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -22235,7 +22266,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}:22238: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:22269: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -22246,7 +22277,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:22249: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:22280: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -22318,7 +22349,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 22321 "configure"
++#line 22352 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22330,16 +22361,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22333: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22364: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22336: \$? = $ac_status" >&5
++  echo "$as_me:22367: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22342: \$? = $ac_status" >&5
++  echo "$as_me:22373: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -22356,7 +22387,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:22359: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:22390: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -22436,7 +22467,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}:22439: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:22470: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -22453,23 +22484,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:22456: checking for db.h" >&5
++echo "$as_me:22487: 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 22462 "configure"
++#line 22493 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:22466: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:22497: \"$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:22472: \$? = $ac_status" >&5
++  echo "$as_me:22503: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22488,11 +22519,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:22491: result: $ac_cv_header_db_h" >&5
++echo "$as_me:22522: 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:22495: checking for version of db" >&5
++echo "$as_me:22526: 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
+@@ -22503,10 +22534,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:22506: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:22537: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22509 "configure"
++#line 22540 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22536,16 +22567,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22539: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22570: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22542: \$? = $ac_status" >&5
++  echo "$as_me:22573: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22548: \$? = $ac_status" >&5
++  echo "$as_me:22579: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -22559,16 +22590,16 @@
+ done
+ 
+ fi
+-echo "$as_me:22562: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:22593: 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:22566: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:22597: 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:22571: checking for db libraries" >&5
++echo "$as_me:22602: 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
+@@ -22598,10 +22629,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:22601: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:22632: testing checking for library "$cf_db_libs" ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22604 "configure"
++#line 22635 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22656,16 +22687,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22690: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22662: \$? = $ac_status" >&5
++  echo "$as_me:22693: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22668: \$? = $ac_status" >&5
++  echo "$as_me:22699: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -22685,11 +22716,11 @@
+ done
+ 
+ fi
+-echo "$as_me:22688: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:22719: 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:22692: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:22723: 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
+@@ -22715,7 +22746,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:22718: error: Cannot find db.h" >&5
++	{ { echo "$as_me:22749: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -22730,7 +22761,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:22733: checking if we should include stdbool.h" >&5
++echo "$as_me:22764: 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
+@@ -22738,7 +22769,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22741 "configure"
++#line 22772 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -22750,23 +22781,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22753: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22784: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22756: \$? = $ac_status" >&5
++  echo "$as_me:22787: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22759: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22790: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22762: \$? = $ac_status" >&5
++  echo "$as_me:22793: \$? = $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 22769 "configure"
++#line 22800 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -22782,16 +22813,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22785: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22816: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22788: \$? = $ac_status" >&5
++  echo "$as_me:22819: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22822: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22794: \$? = $ac_status" >&5
++  echo "$as_me:22825: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -22805,13 +22836,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:22808: result: yes" >&5
++then	echo "$as_me:22839: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22810: result: no" >&5
++else	echo "$as_me:22841: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:22814: checking for builtin bool type" >&5
++echo "$as_me:22845: 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
+@@ -22819,7 +22850,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22822 "configure"
++#line 22853 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22834,16 +22865,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22868: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22840: \$? = $ac_status" >&5
++  echo "$as_me:22871: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22846: \$? = $ac_status" >&5
++  echo "$as_me:22877: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -22856,9 +22887,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:22859: result: yes" >&5
++then	echo "$as_me:22890: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22861: result: no" >&5
++else	echo "$as_me:22892: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -22875,10 +22906,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:22878: checking if we already have C++ library" >&5
++	echo "$as_me:22909: checking if we already have C++ library" >&5
+ echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22881 "configure"
++#line 22912 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -22892,16 +22923,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22895: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22926: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22898: \$? = $ac_status" >&5
++  echo "$as_me:22929: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22901: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22932: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22904: \$? = $ac_status" >&5
++  echo "$as_me:22935: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -22910,7 +22941,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-	echo "$as_me:22913: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:22944: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -22929,7 +22960,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:22932: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:22963: 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
+@@ -22955,7 +22986,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 22958 "configure"
++#line 22989 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -22969,16 +23000,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22972: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23003: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22975: \$? = $ac_status" >&5
++  echo "$as_me:23006: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22978: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23009: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22981: \$? = $ac_status" >&5
++  echo "$as_me:23012: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -22990,7 +23021,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:22993: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:23024: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -23012,7 +23043,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:23015: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:23046: 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
+@@ -23027,15 +23058,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 $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:23030: \"$ac_try\"") >&5
++if { (eval echo "$as_me:23061: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23033: \$? = $ac_status" >&5
++  echo "$as_me:23064: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:23035: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:23066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23038: \$? = $ac_status" >&5
++  echo "$as_me:23069: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -23046,10 +23077,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+-  echo "$as_me:23049: result: yes" >&5
++  echo "$as_me:23080: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:23052: result: no" >&5
++  echo "$as_me:23083: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23069,7 +23100,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:23072: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:23103: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -23090,7 +23121,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23093 "configure"
++#line 23124 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -23104,16 +23135,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:23107: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23138: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23110: \$? = $ac_status" >&5
++  echo "$as_me:23141: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:23113: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23144: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23116: \$? = $ac_status" >&5
++  echo "$as_me:23147: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -23150,7 +23181,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 23153 "configure"
++#line 23184 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23164,16 +23195,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:23167: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23198: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23170: \$? = $ac_status" >&5
++  echo "$as_me:23201: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:23173: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23176: \$? = $ac_status" >&5
++  echo "$as_me:23207: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -23206,7 +23237,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save"
+-	echo "$as_me:23209: result: $cf_cxx_library" >&5
++	echo "$as_me:23240: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -23222,7 +23253,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:23225: checking how to run the C++ preprocessor" >&5
++echo "$as_me:23256: 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
+@@ -23239,18 +23270,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 23242 "configure"
++#line 23273 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:23247: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23278: \"$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:23253: \$? = $ac_status" >&5
++  echo "$as_me:23284: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23273,17 +23304,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23276 "configure"
++#line 23307 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23280: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23311: \"$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:23286: \$? = $ac_status" >&5
++  echo "$as_me:23317: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23320,7 +23351,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:23323: result: $CXXCPP" >&5
++echo "$as_me:23354: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -23330,18 +23361,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 23333 "configure"
++#line 23364 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:23338: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23369: \"$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:23344: \$? = $ac_status" >&5
++  echo "$as_me:23375: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23364,17 +23395,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23367 "configure"
++#line 23398 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23371: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23402: \"$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:23377: \$? = $ac_status" >&5
++  echo "$as_me:23408: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23402,7 +23433,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:23405: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:23436: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -23417,23 +23448,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23420: checking for $ac_header" >&5
++echo "$as_me:23451: 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 23426 "configure"
++#line 23457 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23430: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23461: \"$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:23436: \$? = $ac_status" >&5
++  echo "$as_me:23467: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23452,7 +23483,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:23455: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:23486: 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 <&5
++echo "$as_me:23499: 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 23474 "configure"
++#line 23505 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23478: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23509: \"$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:23484: \$? = $ac_status" >&5
++  echo "$as_me:23515: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23500,7 +23531,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:23503: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:23534: 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 <&5
++	echo "$as_me:23545: 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 23517 "configure"
++#line 23548 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23531,16 +23562,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23534: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23565: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23537: \$? = $ac_status" >&5
++  echo "$as_me:23568: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23571: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23543: \$? = $ac_status" >&5
++  echo "$as_me:23574: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -23549,7 +23580,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:23552: result: $cf_iostream_namespace" >&5
++	echo "$as_me:23583: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -23560,7 +23591,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:23563: checking if we should include stdbool.h" >&5
++echo "$as_me:23594: 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
+@@ -23568,7 +23599,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23571 "configure"
++#line 23602 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23580,23 +23611,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23614: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23586: \$? = $ac_status" >&5
++  echo "$as_me:23617: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23620: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23592: \$? = $ac_status" >&5
++  echo "$as_me:23623: \$? = $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 23599 "configure"
++#line 23630 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -23612,16 +23643,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23646: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23618: \$? = $ac_status" >&5
++  echo "$as_me:23649: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23624: \$? = $ac_status" >&5
++  echo "$as_me:23655: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -23635,13 +23666,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:23638: result: yes" >&5
++then	echo "$as_me:23669: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:23640: result: no" >&5
++else	echo "$as_me:23671: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:23644: checking for builtin bool type" >&5
++echo "$as_me:23675: 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
+@@ -23649,7 +23680,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23652 "configure"
++#line 23683 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23664,16 +23695,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23667: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23698: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23670: \$? = $ac_status" >&5
++  echo "$as_me:23701: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23673: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23704: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23676: \$? = $ac_status" >&5
++  echo "$as_me:23707: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -23686,13 +23717,13 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:23689: result: yes" >&5
++then	echo "$as_me:23720: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:23691: result: no" >&5
++else	echo "$as_me:23722: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:23695: checking for size of bool" >&5
++echo "$as_me:23726: 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
+@@ -23703,7 +23734,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23706 "configure"
++#line 23737 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23745,15 +23776,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23748: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23779: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23751: \$? = $ac_status" >&5
++  echo "$as_me:23782: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23784: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23756: \$? = $ac_status" >&5
++  echo "$as_me:23787: \$? = $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
+@@ -23771,18 +23802,18 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:23774: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:23805: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:23780: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:23811: 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:23785: checking for special defines needed for etip.h" >&5
++echo "$as_me:23816: 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"
+@@ -23800,7 +23831,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 23803 "configure"
++#line 23834 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23814,16 +23845,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23817: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23848: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23820: \$? = $ac_status" >&5
++  echo "$as_me:23851: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23826: \$? = $ac_status" >&5
++  echo "$as_me:23857: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:23878: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:23852: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:23883: 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
+@@ -23866,7 +23897,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23869 "configure"
++#line 23900 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -23885,15 +23916,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23888: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23919: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23891: \$? = $ac_status" >&5
++  echo "$as_me:23922: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23893: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23896: \$? = $ac_status" >&5
++  echo "$as_me:23927: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -23912,7 +23943,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:23915: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:23946: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -23922,7 +23953,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:23925: checking if $CXX accepts static_cast" >&5
++echo "$as_me:23956: 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
+@@ -23936,7 +23967,7 @@
+ ac_main_return=return
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23939 "configure"
++#line 23970 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -23980,16 +24011,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23983: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23986: \$? = $ac_status" >&5
++  echo "$as_me:24017: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23992: \$? = $ac_status" >&5
++  echo "$as_me:24023: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -24007,7 +24038,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:24010: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:24041: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -24056,7 +24087,7 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:24059: checking for size of bool" >&5
++echo "$as_me:24090: 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
+@@ -24067,7 +24098,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 24070 "configure"
++#line 24101 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24109,15 +24140,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:24112: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24143: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24115: \$? = $ac_status" >&5
++  echo "$as_me:24146: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:24117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24148: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24120: \$? = $ac_status" >&5
++  echo "$as_me:24151: \$? = $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
+@@ -24135,25 +24166,25 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:24138: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:24169: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:24144: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:24175: 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:24150: checking for fallback type of bool" >&5
++			echo "$as_me:24181: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ 			case "$host_cpu" in
+ 			(i?86)	cf_cv_type_of_bool=char	;;
+ 			(*)	cf_cv_type_of_bool=int	;;
+ 			esac
+-			echo "$as_me:24156: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:24187: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -24182,7 +24213,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:24185: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:24216: 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
+@@ -24199,7 +24230,7 @@
+ 	unset cf_TEMP_gnat
+ 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:24202: checking for $ac_word" >&5
++echo "$as_me:24233: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24216,7 +24247,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+-   echo "$as_me:24219: found $ac_dir/$ac_word" >&5
++   echo "$as_me:24250: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -24228,10 +24259,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:24231: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:24262: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:24234: result: no" >&5
++  echo "$as_me:24265: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24241,7 +24272,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:24244: checking for $cf_prog_gnat version" >&5
++echo "$as_me:24275: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24252,7 +24283,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:24255: result: $cf_cv_gnat_version" >&5
++echo "$as_me:24286: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -24281,7 +24312,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:24284: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:24315: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test $cf_gprconfig = C
+ 				then
+@@ -24300,10 +24331,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
+-					echo "$as_me:24303: result: $cf_gprconfig_value" >&5
++					echo "$as_me:24334: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:24306: result: missing" >&5
++					echo "$as_me:24337: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -24316,7 +24347,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:24319: checking for gnat version" >&5
++echo "$as_me:24350: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24327,7 +24358,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:24330: result: $cf_cv_gnat_version" >&5
++echo "$as_me:24361: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ 
+@@ -24336,7 +24367,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:24339: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:24370: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -24344,7 +24375,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:24347: checking for $ac_word" >&5
++echo "$as_me:24378: 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
+@@ -24359,7 +24390,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:24362: found $ac_dir/$ac_word" >&5
++echo "$as_me:24393: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -24368,20 +24399,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:24371: result: $M4_exists" >&5
++  echo "$as_me:24402: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:24374: result: no" >&5
++  echo "$as_me:24405: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$ac_cv_prog_M4_exists" = no; then
+ 			cf_cv_prog_gnat_correct=no
+-			{ echo "$as_me:24380: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:24411: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ 		fi
+ 		if test "$cf_cv_prog_gnat_correct" = yes; then
+-			echo "$as_me:24384: checking if GNAT works" >&5
++			echo "$as_me:24415: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf conftest* *~conftest*
+@@ -24409,7 +24440,7 @@
+ fi
+ rm -rf conftest* *~conftest*
+ 
+-			echo "$as_me:24412: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:24443: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -24421,7 +24452,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:24424: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:24455: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -24438,10 +24469,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:24441: result: $ADAFLAGS" >&5
++	echo "$as_me:24472: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:24444: checking if GNATPREP supports -T option" >&5
++echo "$as_me:24475: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24451,11 +24482,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:24454: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:24485: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:24458: checking if GNAT supports generics" >&5
++echo "$as_me:24489: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case $cf_cv_gnat_version in
+ (3.[1-9]*|[4-9].*)
+@@ -24465,7 +24496,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:24468: result: $cf_gnat_generics" >&5
++echo "$as_me:24499: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -24477,7 +24508,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:24480: checking if GNAT supports SIGINT" >&5
++echo "$as_me:24511: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24525,7 +24556,7 @@
+ rm -rf conftest* *~conftest*
+ 
+ fi
+-echo "$as_me:24528: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:24559: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -24538,7 +24569,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:24541: checking if GNAT supports project files" >&5
++echo "$as_me:24572: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case $cf_cv_gnat_version in
+ (3.[0-9]*)
+@@ -24601,15 +24632,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:24604: result: $cf_gnat_projects" >&5
++echo "$as_me:24635: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test $cf_gnat_projects = yes
+ then
+-	echo "$as_me:24610: checking if GNAT supports libraries" >&5
++	echo "$as_me:24641: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:24612: result: $cf_gnat_libraries" >&5
++	echo "$as_me:24643: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -24629,7 +24660,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:24632: checking for ada-compiler" >&5
++echo "$as_me:24663: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -24640,12 +24671,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:24643: result: $cf_ada_compiler" >&5
++echo "$as_me:24674: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:24648: checking for ada-include" >&5
++echo "$as_me:24679: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -24681,7 +24712,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:24684: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:24715: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -24690,10 +24721,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:24693: result: $ADA_INCLUDE" >&5
++echo "$as_me:24724: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:24696: checking for ada-objects" >&5
++echo "$as_me:24727: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -24729,7 +24760,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:24732: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:24763: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -24738,10 +24769,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:24741: result: $ADA_OBJECTS" >&5
++echo "$as_me:24772: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:24744: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:24775: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -24751,14 +24782,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:24754: result: $with_ada_sharedlib" >&5
++echo "$as_me:24785: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:24761: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:24792: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -24778,7 +24809,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:24781: checking for ada-libname" >&5
++echo "$as_me:24812: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -24794,7 +24825,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24797: result: $ADA_LIBNAME" >&5
++echo "$as_me:24828: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -24805,13 +24836,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:24808: checking for wchar_t" >&5
++	echo "$as_me:24839: checking for wchar_t" >&5
+ echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_type_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 24814 "configure"
++#line 24845 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24826,16 +24857,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24829: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24860: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24832: \$? = $ac_status" >&5
++  echo "$as_me:24863: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24835: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24838: \$? = $ac_status" >&5
++  echo "$as_me:24869: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -24845,10 +24876,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:24848: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:24879: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:24851: checking size of wchar_t" >&5
++echo "$as_me:24882: checking size of wchar_t" >&5
+ echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24857,7 +24888,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 24860 "configure"
++#line 24891 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24869,21 +24900,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24903: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24875: \$? = $ac_status" >&5
++  echo "$as_me:24906: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24881: \$? = $ac_status" >&5
++  echo "$as_me:24912: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 24886 "configure"
++#line 24917 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24895,16 +24926,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24898: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24929: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24901: \$? = $ac_status" >&5
++  echo "$as_me:24932: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24935: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24907: \$? = $ac_status" >&5
++  echo "$as_me:24938: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -24920,7 +24951,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 24923 "configure"
++#line 24954 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24932,16 +24963,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24935: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24966: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24938: \$? = $ac_status" >&5
++  echo "$as_me:24969: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24941: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24944: \$? = $ac_status" >&5
++  echo "$as_me:24975: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -24957,7 +24988,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 24960 "configure"
++#line 24991 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24969,16 +25000,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24972: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25003: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24975: \$? = $ac_status" >&5
++  echo "$as_me:25006: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24978: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25009: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24981: \$? = $ac_status" >&5
++  echo "$as_me:25012: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -24991,12 +25022,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:24994: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:25025: 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 24999 "configure"
++#line 25030 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -25012,15 +25043,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:25015: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25046: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25018: \$? = $ac_status" >&5
++  echo "$as_me:25049: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:25020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25023: \$? = $ac_status" >&5
++  echo "$as_me:25054: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -25036,7 +25067,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:25039: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:25070: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:25052: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:25083: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -25067,7 +25098,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:25070: checking for library subsets" >&5
++echo "$as_me:25101: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -25109,7 +25140,7 @@
+ test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+ 
+-echo "$as_me:25112: result: $LIB_SUBSETS" >&5
++echo "$as_me:25143: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -25140,7 +25171,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:25143: checking default library suffix" >&5
++echo "$as_me:25174: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -25151,10 +25182,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:25154: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:25185: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:25157: checking default library-dependency suffix" >&5
++echo "$as_me:25188: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -25212,10 +25243,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:25215: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:25246: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:25218: checking default object directory" >&5
++echo "$as_me:25249: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -25231,11 +25262,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:25234: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:25265: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:25238: checking c++ library-dependency suffix" >&5
++echo "$as_me:25269: checking c++ library-dependency suffix" >&5
+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
+ if test "$with_libtool" != "no"; then
+ 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
+@@ -25303,7 +25334,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:25306: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:25337: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -25479,19 +25510,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:25482: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:25513: checking if linker supports switching between static/dynamic" >&5
+ echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
+ 
+ 	rm -f libconftest.a
+ 	cat >conftest.$ac_ext <
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:25491: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:25522: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25494: \$? = $ac_status" >&5
++  echo "$as_me:25525: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -25502,10 +25533,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 25505 "configure"
++#line 25536 "configure"
+ #include "confdefs.h"
+ 
+-#line 25508 "configure"
++#line 25539 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -25520,16 +25551,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:25523: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25554: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25526: \$? = $ac_status" >&5
++  echo "$as_me:25557: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:25529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25560: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25532: \$? = $ac_status" >&5
++  echo "$as_me:25563: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -25552,7 +25583,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:25555: result: $cf_ldflags_static" >&5
++	echo "$as_me:25586: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test $cf_ldflags_static != yes
+@@ -25568,7 +25599,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:25571: checking where we will install curses.h" >&5
++echo "$as_me:25602: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -25578,7 +25609,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:25581: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:25612: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -25586,7 +25617,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:25589: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:25620: 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
+@@ -25604,7 +25635,7 @@
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:25607: checking for src modules" >&5
++echo "$as_me:25638: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -25669,7 +25700,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:25672: result: $cf_cv_src_modules" >&5
++echo "$as_me:25703: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -25936,7 +25967,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:25939: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:25970: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+ 
+ 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
+@@ -25947,7 +25978,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:25950: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:25981: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -25963,7 +25994,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:25966: result: $PKG_CFLAGS" >&5
++echo "$as_me:25997: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -26024,7 +26055,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
+ 
+-echo "${as_me:-configure}:26027: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:26058: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -26051,7 +26082,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:26054: checking for linker search path" >&5
++echo "$as_me:26085: checking for linker search path" >&5
+ echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
+ if test "${cf_cv_ld_searchpath+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26115,7 +26146,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:26118: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:26149: result: $cf_cv_ld_searchpath" >&5
+ echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
+ 
+ LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
+@@ -26205,7 +26236,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:26208: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:26239: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -26381,7 +26412,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:26384: error: ambiguous option: $1
++    { { echo "$as_me:26415: 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;}
+@@ -26400,7 +26431,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:26403: error: unrecognized option: $1
++  -*) { { echo "$as_me:26434: 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;}
+@@ -26519,7 +26550,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:26522: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:26553: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -27015,7 +27046,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:27018: creating $ac_file" >&5
++    { echo "$as_me:27049: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -27033,7 +27064,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:27036: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:27067: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -27046,7 +27077,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:27049: error: cannot find input file: $f" >&5
++           { { echo "$as_me:27080: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -27062,7 +27093,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:27065: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:27096: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -27071,7 +27102,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:27074: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:27105: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -27108,7 +27139,7 @@
+             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:27111: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:27142: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -27119,7 +27150,7 @@
+     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:27122: WARNING: Some variables may not be substituted:
++      { echo "$as_me:27153: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -27168,7 +27199,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:27171: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:27202: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -27179,7 +27210,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:27182: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:27213: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -27192,7 +27223,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:27195: error: cannot find input file: $f" >&5
++           { { echo "$as_me:27226: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -27250,7 +27281,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:27253: $ac_file is unchanged" >&5
++      { echo "$as_me:27284: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -27595,7 +27626,7 @@
+ 				(cygdll|msysdll|mingw)
+ 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
+ 
+-echo "${as_me:-configure}:27598: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:27629: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1336 
+--- ncurses-6.2-20200222+/dist.mk	2020-02-22 13:49:45.000000000 +0000
++++ ncurses-6.2-20200229/dist.mk	2020-02-29 12:43:09.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1336 2020/02/22 13:49:45 tom Exp $
++# $Id: dist.mk,v 1.1337 2020/02/29 12:43:09 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 2
+-NCURSES_PATCH = 20200222
++NCURSES_PATCH = 20200229
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: form/fty_regex.c
+Prereq:  1.28 
+--- ncurses-6.2-20200222+/form/fty_regex.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/form/fty_regex.c	2020-02-29 15:46:00.000000000 +0000
+@@ -35,12 +35,12 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_regex.c,v 1.28 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: fty_regex.c,v 1.29 2020/02/29 15:46:00 anonymous.maarten Exp $")
+ 
+ #if HAVE_REGEX_H_FUNCS || HAVE_LIB_PCRE2	/* We prefer POSIX regex */
+ 
+-#if HAVE_PCRE2_POSIX_H
+-#include 
++#if HAVE_PCRE2POSIX_H
++#include 
+ #elif HAVE_PCREPOSIX_H
+ #include 
+ #else
+Index: include/nc_mingw.h
+Prereq:  1.7 
+--- ncurses-6.2-20200222+/include/nc_mingw.h	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/include/nc_mingw.h	2020-02-29 15:46:00.000000000 +0000
+@@ -31,7 +31,7 @@
+  * Author: Thomas Dickey, 2008-on                                           *
+  ****************************************************************************/
+ 
+-/* $Id: nc_mingw.h,v 1.7 2020/02/02 23:34:34 tom Exp $ */
++/* $Id: nc_mingw.h,v 1.8 2020/02/29 15:46:00 anonymous.maarten Exp $ */
+ 
+ #ifndef NC_MINGW_H
+ #define NC_MINGW_H 1
+@@ -52,7 +52,9 @@
+ #undef gettimeofday
+ #define gettimeofday(tv,tz) _nc_gettimeofday(tv,tz)
+ 
++#if HAVE_SYS_TIME_H
+ #include 		/* for struct timeval */
++#endif
+ 
+ extern int _nc_gettimeofday(struct timeval *, void *);
+ 
+Index: include/ncurses_defs
+Prereq:  1.92 
+--- ncurses-6.2-20200222+/include/ncurses_defs	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/include/ncurses_defs	2020-02-29 15:46:00.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncurses_defs,v 1.92 2020/02/02 23:34:34 tom Exp $
++# $Id: ncurses_defs,v 1.93 2020/02/29 15:46:00 anonymous.maarten Exp $
+ ##############################################################################
+ # Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+ # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
+@@ -120,7 +120,7 @@
+ HAVE_NC_ALLOC_H
+ HAVE_NEWPAD	1
+ HAVE_PANEL_H
+-HAVE_PCRE2_POSIX_H
++HAVE_PCRE2POSIX_H
+ HAVE_PCREPOSIX_H
+ HAVE_POLL
+ HAVE_POLL_H
+Index: include/ncurses_dll.h.in
+Prereq:  1.12 
+--- ncurses-6.2-20200222+/include/ncurses_dll.h.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/include/ncurses_dll.h.in	2020-02-29 21:53:14.000000000 +0000
+@@ -26,7 +26,7 @@
+  * sale, use or other dealings in this Software without prior written       *
+  * authorization.                                                           *
+  ****************************************************************************/
+-/* $Id: ncurses_dll.h.in,v 1.12 2020/02/02 23:34:34 tom Exp $ */
++/* $Id: ncurses_dll.h.in,v 1.13 2020/02/29 21:53:14 tom Exp $ */
+ 
+ #ifndef NCURSES_DLL_H_incl
+ #define NCURSES_DLL_H_incl 1
+@@ -66,7 +66,7 @@
+  * using functions to access them.
+  */
+ #define NCURSES_PUBLIC_VAR(name) @NCURSES_WRAP_PREFIX@##name
+-#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)
++#define NCURSES_WRAPPED_VAR(type,name) extern NCURSES_IMPEXP type NCURSES_PUBLIC_VAR(name)(void)
+ 
+ /* no longer needed on cygwin or mingw, thanks to auto-import       */
+ /* but this structure may be useful at some point for an MSVC build */
+Index: include/term_entry.h
+Prereq:  1.59 
+--- ncurses-6.2-20200222+/include/term_entry.h	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/include/term_entry.h	2020-02-29 15:46:00.000000000 +0000
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1998-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: term_entry.h,v 1.59 2020/02/02 23:34:34 tom Exp $ */
++/* $Id: term_entry.h,v 1.60 2020/02/29 15:46:00 anonymous.maarten Exp $ */
+ 
+ /*
+  *	term_entry.h -- interface to entry-manipulation code
+@@ -200,8 +200,8 @@
+ extern NCURSES_EXPORT(int) _nc_resolve_uses (bool); /* obs 20040705 */
+ extern NCURSES_EXPORT(int) _nc_resolve_uses2 (bool, bool);
+ extern NCURSES_EXPORT(void) _nc_free_entries (ENTRY *);
+-extern NCURSES_IMPEXP void NCURSES_API (*_nc_check_termtype)(TERMTYPE *); /* obs 20040705 */
+-extern NCURSES_IMPEXP void NCURSES_API (*_nc_check_termtype2)(TERMTYPE2 *, bool);
++extern NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype)(TERMTYPE *); /* obs 20040705 */
++extern NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2)(TERMTYPE2 *, bool);
+ 
+ /* trace_xnames.c */
+ extern NCURSES_EXPORT(void) _nc_trace_xnames (TERMTYPE *);
+Index: ncurses/tinfo/comp_parse.c
+Prereq:  1.109 
+--- ncurses-6.2-20200222+/ncurses/tinfo/comp_parse.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/ncurses/tinfo/comp_parse.c	2020-02-29 15:46:00.000000000 +0000
+@@ -48,10 +48,10 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: comp_parse.c,v 1.109 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: comp_parse.c,v 1.110 2020/02/29 15:46:00 anonymous.maarten Exp $")
+ 
+ static void sanity_check2(TERMTYPE2 *, bool);
+-NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
++NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
+ 
+ static void fixup_acsc(TERMTYPE2 *, int);
+ 
+Index: ncurses/tty/lib_twait.c
+Prereq:  1.74 
+--- ncurses-6.2-20200222+/ncurses/tty/lib_twait.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/ncurses/tty/lib_twait.c	2020-02-29 15:46:00.000000000 +0000
+@@ -71,12 +71,12 @@
+ #  include 
+ # endif
+ #endif
+-#ifdef _WIN32
++#if HAVE_SYS_TIME_H
+ #  include 
+ #endif
+ #undef CUR
+ 
+-MODULE_ID("$Id: lib_twait.c,v 1.74 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_twait.c,v 1.75 2020/02/29 15:46:00 anonymous.maarten Exp $")
+ 
+ static long
+ _nc_gettime(TimeType * t0, int first)
+Index: ncurses/win32con/gettimeofday.c
+Prereq:  1.4 
+--- ncurses-6.2-20200222+/ncurses/win32con/gettimeofday.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/ncurses/win32con/gettimeofday.c	2020-02-29 15:46:00.000000000 +0000
+@@ -36,10 +36,14 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: gettimeofday.c,v 1.4 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: gettimeofday.c,v 1.5 2020/02/29 15:46:00 anonymous.maarten Exp $")
+ 
+ #define JAN1970 116444736000000000LL	/* the value for 01/01/1970 00:00 */
+ 
++#ifdef _MSC_VER
++#include 
++#endif
++
+ int
+ gettimeofday(struct timeval *tv, void *tz GCC_UNUSED)
+ {
+Index: ncurses/win32con/win_driver.c
+Prereq:  1.63 
+--- ncurses-6.2-20200222+/ncurses/win32con/win_driver.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/ncurses/win32con/win_driver.c	2020-03-01 00:18:49.000000000 +0000
+@@ -55,11 +55,9 @@
+ 
+ #define CUR TerminalType(my_term).
+ 
+-MODULE_ID("$Id: win_driver.c,v 1.63 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: win_driver.c,v 1.66 2020/03/01 00:18:49 tom Exp $")
+ 
+-#ifndef __GNUC__
+-#  error We need GCC to compile for MinGW
+-#endif
++#define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
+ 
+ #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
+ 
+@@ -262,7 +260,7 @@
+ con_write16(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, cchar_t *str, int limit)
+ {
+     int actual = 0;
+-    CHAR_INFO ci[limit];
++    CHAR_INFO *ci = TypeAlloca(CHAR_INFO, limit);
+     COORD loc, siz;
+     SMALL_RECT rec;
+     int i;
+@@ -311,7 +309,7 @@
+ static BOOL
+ con_write8(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, chtype *str, int n)
+ {
+-    CHAR_INFO ci[n];
++    CHAR_INFO *ci = TypeAlloca(CHAR_INFO, n);
+     COORD loc, siz;
+     SMALL_RECT rec;
+     int i;
+@@ -510,7 +508,7 @@
+ 	if ((CurScreen(sp)->_clear || NewScreen(sp)->_clear)) {
+ 	    int x;
+ #if USE_WIDEC_SUPPORT
+-	    cchar_t empty[Width];
++	    cchar_t *empty = TypeAlloca(cchar_t, Width);
+ 	    wchar_t blank[2] =
+ 	    {
+ 		L' ', L'\0'
+@@ -519,7 +517,7 @@
+ 	    for (x = 0; x < Width; x++)
+ 		setcchar(&empty[x], blank, 0, 0, 0);
+ #else
+-	    chtype empty[Width];
++	    chtype *empty = TypeAlloca(chtype, Width);
+ 
+ 	    for (x = 0; x < Width; x++)
+ 		empty[x] = ' ';
+@@ -675,8 +673,8 @@
+     int max_cells = (high * wide);
+     int i;
+ 
+-    CHAR_INFO this_screen[max_cells];
+-    CHAR_INFO that_screen[max_cells];
++    CHAR_INFO *this_screen = TypeAlloca(CHAR_INFO, max_cells);
++    CHAR_INFO *that_screen = TypeAlloca(CHAR_INFO, max_cells);
+     COORD this_size;
+     SMALL_RECT this_region;
+     COORD bufferCoord;
+@@ -701,7 +699,9 @@
+ 			bufferCoord,
+ 			&this_region)) {
+ 
+-	    memcpy(that_screen, this_screen, sizeof(that_screen));
++	    memcpy(that_screen,
++		   this_screen,
++		   sizeof(CHAR_INFO) * (size_t) max_cells);
+ 
+ 	    for (i = 0; i < max_cells; i++) {
+ 		that_screen[i].Attributes = RevAttr(that_screen[i].Attributes);
+Index: package/debian-mingw/changelog
+--- ncurses-6.2-20200222+/package/debian-mingw/changelog	2020-02-22 13:49:45.000000000 +0000
++++ ncurses-6.2-20200229/package/debian-mingw/changelog	2020-02-29 12:43:09.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200222) unstable; urgency=low
++ncurses6 (6.2+20200229) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Feb 2020 08:49:45 -0500
++ -- Thomas E. Dickey   Sat, 29 Feb 2020 07:43:09 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.2-20200222+/package/debian-mingw64/changelog	2020-02-22 13:49:45.000000000 +0000
++++ ncurses-6.2-20200229/package/debian-mingw64/changelog	2020-02-29 12:43:09.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200222) unstable; urgency=low
++ncurses6 (6.2+20200229) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Feb 2020 08:49:45 -0500
++ -- Thomas E. Dickey   Sat, 29 Feb 2020 07:43:09 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.2-20200222+/package/debian/changelog	2020-02-22 13:49:45.000000000 +0000
++++ ncurses-6.2-20200229/package/debian/changelog	2020-02-29 12:43:09.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200222) unstable; urgency=low
++ncurses6 (6.2+20200229) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Feb 2020 08:49:45 -0500
++ -- Thomas E. Dickey   Sat, 29 Feb 2020 07:43:09 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.379 
+--- ncurses-6.2-20200222+/package/mingw-ncurses.nsi	2020-02-22 13:49:45.000000000 +0000
++++ ncurses-6.2-20200229/package/mingw-ncurses.nsi	2020-02-29 12:43:09.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.379 2020/02/22 13:49:45 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.380 2020/02/29 12:43:09 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "2"
+ !define VERSION_YYYY  "2020"
+-!define VERSION_MMDD  "0222"
++!define VERSION_MMDD  "0229"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.2-20200222+/package/mingw-ncurses.spec	2020-02-22 13:49:45.000000000 +0000
++++ ncurses-6.2-20200229/package/mingw-ncurses.spec	2020-02-29 12:43:09.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.2
+-Release: 20200222
++Release: 20200229
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.2-20200222+/package/ncurses.spec	2020-02-22 13:49:45.000000000 +0000
++++ ncurses-6.2-20200229/package/ncurses.spec	2020-02-29 12:43:09.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.2
+-Release: 20200222
++Release: 20200229
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.2-20200222+/package/ncursest.spec	2020-02-22 13:49:45.000000000 +0000
++++ ncurses-6.2-20200229/package/ncursest.spec	2020-02-29 12:43:09.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.2
+-Release: 20200222
++Release: 20200229
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/progs.priv.h
+Prereq:  1.48 
+--- ncurses-6.2-20200222+/progs/progs.priv.h	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200229/progs/progs.priv.h	2020-02-29 20:57:36.000000000 +0000
+@@ -31,7 +31,7 @@
+  *  Author: Thomas E. Dickey                    1997-on                     *
+  ****************************************************************************/
+ /*
+- * $Id: progs.priv.h,v 1.48 2020/02/02 23:34:34 tom Exp $
++ * $Id: progs.priv.h,v 1.49 2020/02/29 20:57:36 tom Exp $
+  *
+  *	progs.priv.h
+  *
+@@ -155,6 +155,10 @@
+ #endif /* gcc workarounds */
+ 
+ /* usually in  */
++#ifndef STDIN_FILENO
++#define STDIN_FILENO 0
++#endif
++
+ #ifndef STDOUT_FILENO
+ #define STDOUT_FILENO 1
+ #endif
+Index: test/aclocal.m4
+Prereq:  1.176 
+--- ncurses-6.2-20200222+/test/aclocal.m4	2020-02-09 02:02:53.000000000 +0000
++++ ncurses-6.2-20200229/test/aclocal.m4	2020-02-27 10:21:59.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.176 2020/02/09 02:02:53 tom Exp $
++dnl $Id: aclocal.m4,v 1.177 2020/02/27 10:21:59 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -2349,7 +2349,7 @@
+ 	,[$1=no])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_NCURSES_CONFIG version: 21 updated: 2018/06/20 20:23:13
++dnl CF_NCURSES_CONFIG version: 23 updated: 2020/02/27 05:21:59
+ dnl -----------------
+ dnl Tie together the configure-script macros for ncurses, preferring these in
+ dnl order:
+@@ -2371,11 +2371,47 @@
+ 		AC_MSG_CHECKING(if the $cf_ncuconfig_root package files work)
+ 		cf_have_ncuconfig=unknown
+ 
++		cf_save_CFLAGS="$CFLAGS"
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+ 		cf_save_LIBS="$LIBS"
+ 
+-		CF_ADD_CFLAGS(`$PKG_CONFIG --cflags $cf_ncuconfig_root`)
+-		CF_ADD_LIBS(`$PKG_CONFIG --libs $cf_ncuconfig_root`)
++		cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
++		cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
++
++		# while -W for passing linker flags is prevalent, it is not "standard". 
++		# At least one wrapper for c89/c99 (in Apple's xcode) has its own
++		# incompatible _and_ non-standard -W option which gives an error.  Work
++		# around that pitfall.
++		case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in
++		(x*c[[89]]9@@*-W*)
++			CF_ADD_CFLAGS($cf_pkg_cflags)
++			CF_ADD_LIBS($cf_pkg_libs)
++
++			AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
++				[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
++				[AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
++					int main(void)
++					{ char *xx = curses_version(); return (xx == 0); }],
++					[cf_test_ncuconfig=yes],
++					[cf_test_ncuconfig=no],
++					[cf_test_ncuconfig=maybe])],
++				[cf_test_ncuconfig=no])
++
++			CFLAGS="$cf_save_CFLAGS"
++			CPPFLAGS="$cf_save_CPPFLAGS"
++			LIBS="$cf_save_LIBS"
++
++			if test "x$cf_test_ncuconfig" != xyes; then
++				cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[[^ 	]]*//g'`
++				cf_pkg_cflags="$cf_temp"
++				cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[[^ 	]]*//g'`
++				cf_pkg_libs="$cf_temp"
++			fi
++			;;
++		esac
++
++		CF_ADD_CFLAGS($cf_pkg_cflags)
++		CF_ADD_LIBS($cf_pkg_libs)
+ 
+ 		AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+ 			[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+Index: test/configure
+--- ncurses-6.2-20200222+/test/configure	2020-02-09 02:03:12.000000000 +0000
++++ ncurses-6.2-20200229/test/configure	2020-02-27 10:21:59.000000000 +0000
+@@ -7546,15 +7546,214 @@
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
++		cf_save_CFLAGS="$CFLAGS"
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+ 		cf_save_LIBS="$LIBS"
+ 
++		cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
++		cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
++
++		# while -W for passing linker flags is prevalent, it is not "standard".
++		# At least one wrapper for c89/c99 (in Apple's xcode) has its own
++		# incompatible _and_ non-standard -W option which gives an error.  Work
++		# around that pitfall.
++		case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in
++		(x*c[89]9@@*-W*)
++
++cf_fix_cppflags=no
++cf_new_cflags=
++cf_new_cppflags=
++cf_new_extra_cppflags=
++
++for cf_add_cflags in $cf_pkg_cflags
++do
++case $cf_fix_cppflags in
++(no)
++	case $cf_add_cflags in
++	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
++		case $cf_add_cflags in
++		(-D*)
++			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
++
++			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
++				&& test -z "${cf_tst_cflags}" \
++				&& cf_fix_cppflags=yes
++
++			if test $cf_fix_cppflags = yes ; then
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++				continue
++			elif test "${cf_tst_cflags}" = "\"'" ; then
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++				continue
++			fi
++			;;
++		esac
++		case "$CPPFLAGS" in
++		(*$cf_add_cflags)
++			;;
++		(*)
++			case $cf_add_cflags in
++			(-D*)
++				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
++
++CPPFLAGS=`echo "$CPPFLAGS" | \
++	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
++		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
++
++				;;
++			esac
++
++	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
++	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
++
++			;;
++		esac
++		;;
++	(*)
++
++	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
++	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
++
++		;;
++	esac
++	;;
++(yes)
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
++
++	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
++		&& test -z "${cf_tst_cflags}" \
++		&& cf_fix_cppflags=no
++	;;
++esac
++done
++
++if test -n "$cf_new_cflags" ; then
++
++	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
++	CFLAGS="${CFLAGS}$cf_new_cflags"
++
++fi
++
++if test -n "$cf_new_cppflags" ; then
++
++	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
++	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
++
++fi
++
++if test -n "$cf_new_extra_cppflags" ; then
++
++	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
++	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
++
++fi
++
++cf_add_libs="$LIBS"
++# reverse order
++cf_add_0lib=
++for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++# filter duplicates
++for cf_add_1lib in $cf_add_0lib; do
++	for cf_add_2lib in $cf_add_libs; do
++		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
++			cf_add_1lib=
++			break
++		fi
++	done
++	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
++done
++LIBS="$cf_add_libs"
++
++			cat >conftest.$ac_ext <<_ACEOF
++#line 7678 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++int
++main (void)
++{
++initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:7690: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:7693: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:7696: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7699: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  if test "$cross_compiling" = yes; then
++  cf_test_ncuconfig=maybe
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7705 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++					int main(void)
++					{ char *xx = curses_version(); return (xx == 0); }
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:7712: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:7715: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:7717: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7720: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_test_ncuconfig=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_test_ncuconfig=no
++fi
++rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_test_ncuconfig=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++
++			CFLAGS="$cf_save_CFLAGS"
++			CPPFLAGS="$cf_save_CPPFLAGS"
++			LIBS="$cf_save_LIBS"
++
++			if test "x$cf_test_ncuconfig" != xyes; then
++				cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ 	]*//g'`
++				cf_pkg_cflags="$cf_temp"
++				cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ 	]*//g'`
++				cf_pkg_libs="$cf_temp"
++			fi
++			;;
++		esac
++
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root`
++for cf_add_cflags in $cf_pkg_cflags
+ do
+ case $cf_fix_cppflags in
+ (no)
+@@ -7650,7 +7849,7 @@
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -7664,7 +7863,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 7667 "configure"
++#line 7866 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7676,37 +7875,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7679: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7878: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7682: \$? = $ac_status" >&5
++  echo "$as_me:7881: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7688: \$? = $ac_status" >&5
++  echo "$as_me:7887: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7694 "configure"
++#line 7893 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7701: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7704: \$? = $ac_status" >&5
++  echo "$as_me:7903: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7905: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7709: \$? = $ac_status" >&5
++  echo "$as_me:7908: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -7723,7 +7922,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:7726: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:7925: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -7739,7 +7938,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:7742: checking for terminfo header" >&5
++echo "$as_me:7941: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7757,7 +7956,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7760 "configure"
++#line 7959 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7772,16 +7971,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7974: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7778: \$? = $ac_status" >&5
++  echo "$as_me:7977: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7980: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7784: \$? = $ac_status" >&5
++  echo "$as_me:7983: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7797,7 +7996,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7800: result: $cf_cv_term_header" >&5
++echo "$as_me:7999: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7832,7 +8031,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:7835: result: no" >&5
++		echo "$as_me:8034: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -7848,7 +8047,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:7851: checking for $ac_word" >&5
++echo "$as_me:8050: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7863,7 +8062,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:7866: found $ac_dir/$ac_word" >&5
++echo "$as_me:8065: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7871,10 +8070,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:7874: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:8073: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:7877: result: no" >&5
++  echo "$as_me:8076: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7887,7 +8086,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:7890: checking for $ac_word" >&5
++echo "$as_me:8089: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7902,7 +8101,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:7905: found $ac_dir/$ac_word" >&5
++echo "$as_me:8104: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7910,10 +8109,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:7913: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:8112: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:7916: result: no" >&5
++  echo "$as_me:8115: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8042,7 +8241,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:8045: checking if we have identified curses headers" >&5
++echo "$as_me:8244: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8054,7 +8253,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8057 "configure"
++#line 8256 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8066,16 +8265,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8069: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8268: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8072: \$? = $ac_status" >&5
++  echo "$as_me:8271: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8078: \$? = $ac_status" >&5
++  echo "$as_me:8277: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8086,11 +8285,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8089: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8288: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:8093: error: No curses header-files found" >&5
++	{ { echo "$as_me:8292: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8100,23 +8299,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8103: checking for $ac_header" >&5
++echo "$as_me:8302: 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 8109 "configure"
++#line 8308 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8113: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8312: \"$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:8119: \$? = $ac_status" >&5
++  echo "$as_me:8318: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8135,7 +8334,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:8138: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:8337: 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 <conftest.$ac_ext <<_ACEOF
+-#line 8194 "configure"
++#line 8393 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8203,16 +8402,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8405: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8209: \$? = $ac_status" >&5
++  echo "$as_me:8408: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8212: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8411: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8215: \$? = $ac_status" >&5
++  echo "$as_me:8414: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8229,7 +8428,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8232: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8431: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8248,7 +8447,7 @@
+ 
+ }
+ 
+-echo "$as_me:8251: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8450: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8260,7 +8459,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8263 "configure"
++#line 8462 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8284,16 +8483,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8287: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8486: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8290: \$? = $ac_status" >&5
++  echo "$as_me:8489: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8293: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8492: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8296: \$? = $ac_status" >&5
++  echo "$as_me:8495: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8308,14 +8507,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8311: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8510: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:8318: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8517: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8436,7 +8635,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8439 "configure"
++#line 8638 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8448,16 +8647,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8451: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8650: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8454: \$? = $ac_status" >&5
++  echo "$as_me:8653: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8457: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8656: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8460: \$? = $ac_status" >&5
++  echo "$as_me:8659: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8474,7 +8673,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8477: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8676: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8497,7 +8696,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8500 "configure"
++#line 8699 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8521,16 +8720,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8723: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8527: \$? = $ac_status" >&5
++  echo "$as_me:8726: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8729: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8533: \$? = $ac_status" >&5
++  echo "$as_me:8732: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8551,12 +8750,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8554: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8753: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8559: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8758: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
+@@ -8592,7 +8791,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8595 "configure"
++#line 8794 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8604,16 +8803,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8607: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8806: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8610: \$? = $ac_status" >&5
++  echo "$as_me:8809: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8613: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8812: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8616: \$? = $ac_status" >&5
++  echo "$as_me:8815: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8630,7 +8829,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8633: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8832: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8678,7 +8877,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:8681: checking for terminfo header" >&5
++echo "$as_me:8880: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8696,7 +8895,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8699 "configure"
++#line 8898 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8711,16 +8910,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8714: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8913: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8717: \$? = $ac_status" >&5
++  echo "$as_me:8916: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8919: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8723: \$? = $ac_status" >&5
++  echo "$as_me:8922: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8736,7 +8935,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8739: result: $cf_cv_term_header" >&5
++echo "$as_me:8938: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8774,7 +8973,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:8777: checking for ncurses version" >&5
++echo "$as_me:8976: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8800,10 +8999,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:8803: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:9002: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8806: \$? = $ac_status" >&5
++  echo "$as_me:9005: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -8813,7 +9012,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8816 "configure"
++#line 9015 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8838,15 +9037,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:8841: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9040: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8844: \$? = $ac_status" >&5
++  echo "$as_me:9043: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:8846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8849: \$? = $ac_status" >&5
++  echo "$as_me:9048: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -8860,7 +9059,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:8863: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9062: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -8873,7 +9072,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:8876: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9075: 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
+@@ -8881,7 +9080,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8884 "configure"
++#line 9083 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8900,16 +9099,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9102: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8906: \$? = $ac_status" >&5
++  echo "$as_me:9105: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8909: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9108: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8912: \$? = $ac_status" >&5
++  echo "$as_me:9111: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -8920,10 +9119,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8923: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9122: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+-  echo "$as_me:8926: checking for initscr in -lgpm" >&5
++  echo "$as_me:9125: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8931,7 +9130,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8934 "configure"
++#line 9133 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8950,16 +9149,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8953: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9152: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8956: \$? = $ac_status" >&5
++  echo "$as_me:9155: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9158: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8962: \$? = $ac_status" >&5
++  echo "$as_me:9161: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -8970,7 +9169,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8973: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9172: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test $ac_cv_lib_gpm_initscr = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -8985,7 +9184,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:8988: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:9187: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8993,7 +9192,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8996 "configure"
++#line 9195 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9012,16 +9211,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9015: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9214: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9018: \$? = $ac_status" >&5
++  echo "$as_me:9217: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9220: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9024: \$? = $ac_status" >&5
++  echo "$as_me:9223: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9032,7 +9231,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9035: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9234: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -9081,13 +9280,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9084: checking for initscr" >&5
++	echo "$as_me:9283: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9090 "configure"
++#line 9289 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9118,16 +9317,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9121: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9320: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9124: \$? = $ac_status" >&5
++  echo "$as_me:9323: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9130: \$? = $ac_status" >&5
++  echo "$as_me:9329: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9137,18 +9336,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9140: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9339: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test $ac_cv_func_initscr = yes; then
+   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:9147: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9346: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9151 "configure"
++#line 9350 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9160,25 +9359,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9163: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9362: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9166: \$? = $ac_status" >&5
++  echo "$as_me:9365: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9169: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9172: \$? = $ac_status" >&5
++  echo "$as_me:9371: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9174: result: yes" >&5
++  echo "$as_me:9373: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9181: result: no" >&5
++echo "$as_me:9380: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9246,11 +9445,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9249: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9448: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 9253 "configure"
++#line 9452 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9262,25 +9461,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9265: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9464: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9268: \$? = $ac_status" >&5
++  echo "$as_me:9467: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9271: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9470: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9274: \$? = $ac_status" >&5
++  echo "$as_me:9473: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9276: result: yes" >&5
++  echo "$as_me:9475: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9283: result: no" >&5
++echo "$as_me:9482: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9295,7 +9494,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:9298: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9497: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9303,7 +9502,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9306: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9505: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -9313,7 +9512,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9316 "configure"
++#line 9515 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9325,23 +9524,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9527: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9331: \$? = $ac_status" >&5
++  echo "$as_me:9530: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9337: \$? = $ac_status" >&5
++  echo "$as_me:9536: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9339: result: yes" >&5
++  echo "$as_me:9538: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9344: result: no" >&5
++echo "$as_me:9543: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9366,25 +9565,224 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:9369: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:9568: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:9372: result: yes" >&5
++		echo "$as_me:9571: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:9375: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:9574: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
++		cf_save_CFLAGS="$CFLAGS"
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+ 		cf_save_LIBS="$LIBS"
+ 
++		cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
++		cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
++
++		# while -W for passing linker flags is prevalent, it is not "standard".
++		# At least one wrapper for c89/c99 (in Apple's xcode) has its own
++		# incompatible _and_ non-standard -W option which gives an error.  Work
++		# around that pitfall.
++		case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in
++		(x*c[89]9@@*-W*)
++
++cf_fix_cppflags=no
++cf_new_cflags=
++cf_new_cppflags=
++cf_new_extra_cppflags=
++
++for cf_add_cflags in $cf_pkg_cflags
++do
++case $cf_fix_cppflags in
++(no)
++	case $cf_add_cflags in
++	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
++		case $cf_add_cflags in
++		(-D*)
++			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
++
++			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
++				&& test -z "${cf_tst_cflags}" \
++				&& cf_fix_cppflags=yes
++
++			if test $cf_fix_cppflags = yes ; then
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++				continue
++			elif test "${cf_tst_cflags}" = "\"'" ; then
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++				continue
++			fi
++			;;
++		esac
++		case "$CPPFLAGS" in
++		(*$cf_add_cflags)
++			;;
++		(*)
++			case $cf_add_cflags in
++			(-D*)
++				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
++
++CPPFLAGS=`echo "$CPPFLAGS" | \
++	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
++		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
++
++				;;
++			esac
++
++	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
++	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
++
++			;;
++		esac
++		;;
++	(*)
++
++	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
++	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
++
++		;;
++	esac
++	;;
++(yes)
++
++	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
++	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
++
++	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
++
++	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
++		&& test -z "${cf_tst_cflags}" \
++		&& cf_fix_cppflags=no
++	;;
++esac
++done
++
++if test -n "$cf_new_cflags" ; then
++
++	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
++	CFLAGS="${CFLAGS}$cf_new_cflags"
++
++fi
++
++if test -n "$cf_new_cppflags" ; then
++
++	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
++	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
++
++fi
++
++if test -n "$cf_new_extra_cppflags" ; then
++
++	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
++	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
++
++fi
++
++cf_add_libs="$LIBS"
++# reverse order
++cf_add_0lib=
++for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++# filter duplicates
++for cf_add_1lib in $cf_add_0lib; do
++	for cf_add_2lib in $cf_add_libs; do
++		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
++			cf_add_1lib=
++			break
++		fi
++	done
++	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
++done
++LIBS="$cf_add_libs"
++
++			cat >conftest.$ac_ext <<_ACEOF
++#line 9707 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++int
++main (void)
++{
++initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:9719: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:9722: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:9725: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:9728: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  if test "$cross_compiling" = yes; then
++  cf_test_ncuconfig=maybe
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9734 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++					int main(void)
++					{ char *xx = curses_version(); return (xx == 0); }
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:9741: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:9744: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:9746: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:9749: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_test_ncuconfig=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_test_ncuconfig=no
++fi
++rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_test_ncuconfig=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++
++			CFLAGS="$cf_save_CFLAGS"
++			CPPFLAGS="$cf_save_CPPFLAGS"
++			LIBS="$cf_save_LIBS"
++
++			if test "x$cf_test_ncuconfig" != xyes; then
++				cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ 	]*//g'`
++				cf_pkg_cflags="$cf_temp"
++				cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ 	]*//g'`
++				cf_pkg_libs="$cf_temp"
++			fi
++			;;
++		esac
++
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root`
++for cf_add_cflags in $cf_pkg_cflags
+ do
+ case $cf_fix_cppflags in
+ (no)
+@@ -9480,7 +9878,7 @@
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -9494,7 +9892,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9497 "configure"
++#line 9895 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9506,37 +9904,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9509: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9907: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9512: \$? = $ac_status" >&5
++  echo "$as_me:9910: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9515: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9913: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9518: \$? = $ac_status" >&5
++  echo "$as_me:9916: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9524 "configure"
++#line 9922 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9531: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9929: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9534: \$? = $ac_status" >&5
++  echo "$as_me:9932: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9539: \$? = $ac_status" >&5
++  echo "$as_me:9937: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9553,7 +9951,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:9556: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9954: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -9569,7 +9967,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9572: checking for terminfo header" >&5
++echo "$as_me:9970: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9587,7 +9985,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9590 "configure"
++#line 9988 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9602,16 +10000,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10003: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9608: \$? = $ac_status" >&5
++  echo "$as_me:10006: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10009: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9614: \$? = $ac_status" >&5
++  echo "$as_me:10012: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9627,7 +10025,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9630: result: $cf_cv_term_header" >&5
++echo "$as_me:10028: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9662,7 +10060,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9665: result: no" >&5
++		echo "$as_me:10063: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9678,7 +10076,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:9681: checking for $ac_word" >&5
++echo "$as_me:10079: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9693,7 +10091,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:9696: found $ac_dir/$ac_word" >&5
++echo "$as_me:10094: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9701,10 +10099,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9704: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:10102: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9707: result: no" >&5
++  echo "$as_me:10105: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9717,7 +10115,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:9720: checking for $ac_word" >&5
++echo "$as_me:10118: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9732,7 +10130,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:9735: found $ac_dir/$ac_word" >&5
++echo "$as_me:10133: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9740,10 +10138,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9743: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:10141: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9746: result: no" >&5
++  echo "$as_me:10144: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9872,7 +10270,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:9875: checking if we have identified curses headers" >&5
++echo "$as_me:10273: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9884,7 +10282,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9887 "configure"
++#line 10285 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9896,16 +10294,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9899: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10297: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9902: \$? = $ac_status" >&5
++  echo "$as_me:10300: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9905: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9908: \$? = $ac_status" >&5
++  echo "$as_me:10306: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9916,11 +10314,11 @@
+ done
+ 
+ fi
+-echo "$as_me:9919: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10317: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:9923: error: No curses header-files found" >&5
++	{ { echo "$as_me:10321: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9930,23 +10328,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:9933: checking for $ac_header" >&5
++echo "$as_me:10331: 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 9939 "configure"
++#line 10337 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9943: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10341: \"$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:9949: \$? = $ac_status" >&5
++  echo "$as_me:10347: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9965,7 +10363,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:9968: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:10366: 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 <conftest.$ac_ext <<_ACEOF
+-#line 10024 "configure"
++#line 10422 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10033,16 +10431,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10036: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10434: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10039: \$? = $ac_status" >&5
++  echo "$as_me:10437: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10042: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10440: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10045: \$? = $ac_status" >&5
++  echo "$as_me:10443: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10059,7 +10457,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10062: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10460: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10078,7 +10476,7 @@
+ 
+ }
+ 
+-echo "$as_me:10081: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10479: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10090,7 +10488,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10093 "configure"
++#line 10491 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10114,16 +10512,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10117: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10515: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10120: \$? = $ac_status" >&5
++  echo "$as_me:10518: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10123: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10126: \$? = $ac_status" >&5
++  echo "$as_me:10524: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -10138,14 +10536,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:10141: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10539: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:10148: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10546: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10266,7 +10664,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 10269 "configure"
++#line 10667 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10278,16 +10676,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10281: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10679: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10284: \$? = $ac_status" >&5
++  echo "$as_me:10682: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10287: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10685: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10290: \$? = $ac_status" >&5
++  echo "$as_me:10688: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10304,7 +10702,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10307: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10705: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10327,7 +10725,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10330 "configure"
++#line 10728 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10351,16 +10749,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10354: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10357: \$? = $ac_status" >&5
++  echo "$as_me:10755: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10360: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10363: \$? = $ac_status" >&5
++  echo "$as_me:10761: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -10381,12 +10779,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10384: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10782: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:10389: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:10787: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
+@@ -10422,7 +10820,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 10425 "configure"
++#line 10823 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10434,16 +10832,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10437: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10835: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10440: \$? = $ac_status" >&5
++  echo "$as_me:10838: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10443: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10841: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10446: \$? = $ac_status" >&5
++  echo "$as_me:10844: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10460,7 +10858,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10463: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10861: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10508,7 +10906,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10511: checking for terminfo header" >&5
++echo "$as_me:10909: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10526,7 +10924,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10529 "configure"
++#line 10927 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10541,16 +10939,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10544: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10942: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10547: \$? = $ac_status" >&5
++  echo "$as_me:10945: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10550: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10948: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10553: \$? = $ac_status" >&5
++  echo "$as_me:10951: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10566,7 +10964,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10569: result: $cf_cv_term_header" >&5
++echo "$as_me:10967: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10604,7 +11002,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10607: checking for ncurses version" >&5
++echo "$as_me:11005: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10630,10 +11028,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10633: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:11031: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10636: \$? = $ac_status" >&5
++  echo "$as_me:11034: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -10643,7 +11041,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10646 "configure"
++#line 11044 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10668,15 +11066,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:10671: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11069: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10674: \$? = $ac_status" >&5
++  echo "$as_me:11072: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:10676: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10679: \$? = $ac_status" >&5
++  echo "$as_me:11077: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10690,7 +11088,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:10693: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:11091: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10703,7 +11101,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10706: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:11104: 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
+@@ -10711,7 +11109,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10714 "configure"
++#line 11112 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10730,16 +11128,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10733: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11131: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10736: \$? = $ac_status" >&5
++  echo "$as_me:11134: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11137: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10742: \$? = $ac_status" >&5
++  echo "$as_me:11140: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10750,10 +11148,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10753: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:11151: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+-  echo "$as_me:10756: checking for initscr in -lgpm" >&5
++  echo "$as_me:11154: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10761,7 +11159,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10764 "configure"
++#line 11162 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10780,16 +11178,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11181: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10786: \$? = $ac_status" >&5
++  echo "$as_me:11184: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10789: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11187: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10792: \$? = $ac_status" >&5
++  echo "$as_me:11190: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10800,7 +11198,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10803: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11201: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test $ac_cv_lib_gpm_initscr = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -10815,7 +11213,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:10818: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:11216: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10823,7 +11221,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10826 "configure"
++#line 11224 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10842,16 +11240,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10845: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11243: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10848: \$? = $ac_status" >&5
++  echo "$as_me:11246: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10854: \$? = $ac_status" >&5
++  echo "$as_me:11252: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10862,7 +11260,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10865: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11263: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -10911,13 +11309,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:10914: checking for initscr" >&5
++	echo "$as_me:11312: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10920 "configure"
++#line 11318 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10948,16 +11346,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10954: \$? = $ac_status" >&5
++  echo "$as_me:11352: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10957: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10960: \$? = $ac_status" >&5
++  echo "$as_me:11358: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -10967,18 +11365,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10970: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11368: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test $ac_cv_func_initscr = yes; then
+   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:10977: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:11375: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 10981 "configure"
++#line 11379 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10990,25 +11388,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11391: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10996: \$? = $ac_status" >&5
++  echo "$as_me:11394: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11397: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11002: \$? = $ac_status" >&5
++  echo "$as_me:11400: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:11004: result: yes" >&5
++  echo "$as_me:11402: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11011: result: no" >&5
++echo "$as_me:11409: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -11076,11 +11474,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:11079: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:11477: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 11083 "configure"
++#line 11481 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11092,25 +11490,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11095: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11493: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11098: \$? = $ac_status" >&5
++  echo "$as_me:11496: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11499: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11104: \$? = $ac_status" >&5
++  echo "$as_me:11502: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:11106: result: yes" >&5
++  echo "$as_me:11504: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11113: result: no" >&5
++echo "$as_me:11511: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -11125,7 +11523,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:11128: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:11526: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11133,7 +11531,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:11136: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:11534: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -11143,7 +11541,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11146 "configure"
++#line 11544 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11155,23 +11553,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11158: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11556: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11161: \$? = $ac_status" >&5
++  echo "$as_me:11559: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11164: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11562: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11167: \$? = $ac_status" >&5
++  echo "$as_me:11565: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:11169: result: yes" >&5
++  echo "$as_me:11567: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11174: result: no" >&5
++echo "$as_me:11572: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11191,7 +11589,7 @@
+ 
+ 	;;
+ (pdcurses)
+-	echo "$as_me:11194: checking for X" >&5
++	echo "$as_me:11592: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -11295,17 +11693,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11298 "configure"
++#line 11696 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:11302: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11700: \"$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:11308: \$? = $ac_status" >&5
++  echo "$as_me:11706: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11338,7 +11736,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11341 "configure"
++#line 11739 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11350,16 +11748,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11353: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11751: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11356: \$? = $ac_status" >&5
++  echo "$as_me:11754: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11362: \$? = $ac_status" >&5
++  echo "$as_me:11760: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -11397,7 +11795,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:11400: result: $have_x" >&5
++  echo "$as_me:11798: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -11407,7 +11805,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:11410: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:11808: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -11431,11 +11829,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:11434: checking whether -R must be followed by a space" >&5
++      echo "$as_me:11832: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >conftest.$ac_ext <<_ACEOF
+-#line 11438 "configure"
++#line 11836 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11447,16 +11845,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11450: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11848: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11453: \$? = $ac_status" >&5
++  echo "$as_me:11851: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11456: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11459: \$? = $ac_status" >&5
++  echo "$as_me:11857: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -11466,13 +11864,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:11469: result: no" >&5
++	echo "$as_me:11867: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11475 "configure"
++#line 11873 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11484,16 +11882,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11487: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11490: \$? = $ac_status" >&5
++  echo "$as_me:11888: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11891: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11496: \$? = $ac_status" >&5
++  echo "$as_me:11894: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_space=yes
+ else
+@@ -11503,11 +11901,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:11506: result: yes" >&5
++	  echo "$as_me:11904: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:11510: result: neither works" >&5
++	  echo "$as_me:11908: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -11527,7 +11925,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 11530 "configure"
++#line 11928 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11546,22 +11944,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11549: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11947: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11552: \$? = $ac_status" >&5
++  echo "$as_me:11950: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11555: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11953: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11558: \$? = $ac_status" >&5
++  echo "$as_me:11956: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11564: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:11962: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11569,7 +11967,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11572 "configure"
++#line 11970 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11588,16 +11986,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11989: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11594: \$? = $ac_status" >&5
++  echo "$as_me:11992: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11995: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11600: \$? = $ac_status" >&5
++  echo "$as_me:11998: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -11608,14 +12006,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11611: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:12009: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:11618: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:12016: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11623,7 +12021,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11626 "configure"
++#line 12024 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11642,16 +12040,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11645: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12043: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11648: \$? = $ac_status" >&5
++  echo "$as_me:12046: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12049: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11654: \$? = $ac_status" >&5
++  echo "$as_me:12052: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -11662,7 +12060,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11665: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:12063: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -11681,13 +12079,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:11684: checking for gethostbyname" >&5
++    echo "$as_me:12082: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11690 "configure"
++#line 12088 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11718,16 +12116,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11721: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12119: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11724: \$? = $ac_status" >&5
++  echo "$as_me:12122: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11730: \$? = $ac_status" >&5
++  echo "$as_me:12128: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -11737,11 +12135,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11740: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:12138: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:11744: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:12142: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11749,7 +12147,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11752 "configure"
++#line 12150 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11768,16 +12166,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11771: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12169: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11774: \$? = $ac_status" >&5
++  echo "$as_me:12172: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12175: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11780: \$? = $ac_status" >&5
++  echo "$as_me:12178: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -11788,14 +12186,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11791: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:12189: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:11798: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:12196: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11803,7 +12201,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11806 "configure"
++#line 12204 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11822,16 +12220,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11825: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12223: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11828: \$? = $ac_status" >&5
++  echo "$as_me:12226: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11831: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12229: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11834: \$? = $ac_status" >&5
++  echo "$as_me:12232: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -11842,7 +12240,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11845: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:12243: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -11858,13 +12256,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:11861: checking for connect" >&5
++    echo "$as_me:12259: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11867 "configure"
++#line 12265 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11895,16 +12293,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11898: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12296: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11901: \$? = $ac_status" >&5
++  echo "$as_me:12299: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12302: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11907: \$? = $ac_status" >&5
++  echo "$as_me:12305: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -11914,11 +12312,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11917: result: $ac_cv_func_connect" >&5
++echo "$as_me:12315: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:11921: checking for connect in -lsocket" >&5
++      echo "$as_me:12319: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11926,7 +12324,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11929 "configure"
++#line 12327 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11945,16 +12343,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11948: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12346: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11951: \$? = $ac_status" >&5
++  echo "$as_me:12349: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11954: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12352: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11957: \$? = $ac_status" >&5
++  echo "$as_me:12355: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -11965,7 +12363,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11968: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:12366: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -11974,13 +12372,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:11977: checking for remove" >&5
++    echo "$as_me:12375: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11983 "configure"
++#line 12381 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12011,16 +12409,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12412: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12017: \$? = $ac_status" >&5
++  echo "$as_me:12415: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12023: \$? = $ac_status" >&5
++  echo "$as_me:12421: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -12030,11 +12428,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12033: result: $ac_cv_func_remove" >&5
++echo "$as_me:12431: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:12037: checking for remove in -lposix" >&5
++      echo "$as_me:12435: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12042,7 +12440,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12045 "configure"
++#line 12443 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12061,16 +12459,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12064: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12462: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12067: \$? = $ac_status" >&5
++  echo "$as_me:12465: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12073: \$? = $ac_status" >&5
++  echo "$as_me:12471: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -12081,7 +12479,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12084: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:12482: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -12090,13 +12488,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:12093: checking for shmat" >&5
++    echo "$as_me:12491: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12099 "configure"
++#line 12497 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12127,16 +12525,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12130: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12133: \$? = $ac_status" >&5
++  echo "$as_me:12531: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12139: \$? = $ac_status" >&5
++  echo "$as_me:12537: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -12146,11 +12544,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12149: result: $ac_cv_func_shmat" >&5
++echo "$as_me:12547: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:12153: checking for shmat in -lipc" >&5
++      echo "$as_me:12551: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12158,7 +12556,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12161 "configure"
++#line 12559 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12177,16 +12575,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12578: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12183: \$? = $ac_status" >&5
++  echo "$as_me:12581: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12584: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12189: \$? = $ac_status" >&5
++  echo "$as_me:12587: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -12197,7 +12595,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12200: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:12598: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -12215,7 +12613,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:12218: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:12616: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12223,7 +12621,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12226 "configure"
++#line 12624 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12242,16 +12640,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12245: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12643: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12248: \$? = $ac_status" >&5
++  echo "$as_me:12646: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12251: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12254: \$? = $ac_status" >&5
++  echo "$as_me:12652: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -12262,7 +12660,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12265: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:12663: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -12274,7 +12672,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:12277: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:12675: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12285,14 +12683,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:12288: result: yes" >&5
++	echo "$as_me:12686: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12291: result: no" >&5
++	echo "$as_me:12689: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12295: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:12693: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12303,14 +12701,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3dxft
+-	echo "$as_me:12306: result: yes" >&5
++	echo "$as_me:12704: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12309: result: no" >&5
++	echo "$as_me:12707: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12313: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:12711: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12321,14 +12719,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:12324: result: yes" >&5
++	echo "$as_me:12722: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12327: result: no" >&5
++	echo "$as_me:12725: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12331: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:12729: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12339,10 +12737,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:12342: result: yes" >&5
++	echo "$as_me:12740: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12345: result: no" >&5
++	echo "$as_me:12743: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -12362,17 +12760,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
+ 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
+ 
+-echo "${as_me:-configure}:12365: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:12763: testing found package $cf_athena_pkg ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:12371: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12769: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:12375: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12773: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -12503,20 +12901,20 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:12506: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:12904: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
+ 
+-echo "$as_me:12512: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:12910: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12519 "configure"
++#line 12917 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12532,16 +12930,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12535: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12933: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12538: \$? = $ac_status" >&5
++  echo "$as_me:12936: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12541: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12939: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12544: \$? = $ac_status" >&5
++  echo "$as_me:12942: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -12551,7 +12949,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12554: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:12952: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -12563,7 +12961,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:12566: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:12964: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -12571,17 +12969,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:12574: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:12972: testing found package xmu ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:12580: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12978: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:12584: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12982: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -12701,12 +13099,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:12704: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:13102: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:12709: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:13107: testing ...after  $LIBS ..." 1>&5
+ 
+ else
+ 	cf_pkgconfig_incs=
+@@ -12714,12 +13112,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:12717: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:13115: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:12722: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:13120: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -12730,7 +13128,7 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:12733: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:13131: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -12755,17 +13153,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:12758: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:13156: testing found package Xext ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:12764: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13162: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:12768: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13166: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -12886,7 +13284,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:12889: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:13287: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12894,7 +13292,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12897 "configure"
++#line 13295 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12913,16 +13311,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13314: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12919: \$? = $ac_status" >&5
++  echo "$as_me:13317: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12925: \$? = $ac_status" >&5
++  echo "$as_me:13323: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -12933,7 +13331,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12936: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:13334: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
+ 
+@@ -12969,17 +13367,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:12972: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:13370: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:12978: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13376: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:12982: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13380: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13099,24 +13497,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13102: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:13500: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:13109: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:13507: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13115: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13513: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13119: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13517: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13236,24 +13634,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13239: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:13637: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:13246: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:13644: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13252: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13650: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13256: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13654: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13373,24 +13771,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13376: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:13774: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:13383: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:13781: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13389: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13787: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13393: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13791: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13510,7 +13908,7 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13513: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:13911: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
+@@ -13521,17 +13919,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:13524: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:13922: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13530: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13928: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13534: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13932: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13652,14 +14050,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:13655: checking for usable X dependency" >&5
++echo "$as_me:14053: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13662 "configure"
++#line 14060 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13678,16 +14076,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13681: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13684: \$? = $ac_status" >&5
++  echo "$as_me:14082: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13690: \$? = $ac_status" >&5
++  echo "$as_me:14088: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -13697,30 +14095,30 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13700: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:14098: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ 		if test "$cf_cv_xt_x11_compat" = no
+ 		then
+ 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+ 
+-echo "${as_me:-configure}:13706: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:14104: testing work around broken X11 dependency ..." 1>&5
+ 
+ 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:13713: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14111: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13719: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14117: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13723: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14121: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13843,12 +14241,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13846: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14244: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13851: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14249: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -13856,14 +14254,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:13859: checking for usable X Toolkit package" >&5
++echo "$as_me:14257: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13866 "configure"
++#line 14264 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13878,16 +14276,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14279: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13884: \$? = $ac_status" >&5
++  echo "$as_me:14282: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13887: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13890: \$? = $ac_status" >&5
++  echo "$as_me:14288: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -13897,7 +14295,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13900: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:14298: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -13911,22 +14309,22 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:13914: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:14312: testing work around broken ICE dependency ..." 1>&5
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:13919: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14317: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13925: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14323: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13929: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14327: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14045,17 +14443,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:14048: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14446: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14054: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14452: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14058: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14456: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14184,12 +14582,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14187: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14585: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14192: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14590: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14209,7 +14607,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:14212: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14610: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -14294,7 +14692,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:14297: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:14695: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14304,7 +14702,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14307: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:14705: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14314,7 +14712,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14317: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:14715: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -14323,7 +14721,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14326 "configure"
++#line 14724 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14335,16 +14733,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14736: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14341: \$? = $ac_status" >&5
++  echo "$as_me:14739: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14347: \$? = $ac_status" >&5
++  echo "$as_me:14745: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -14352,12 +14750,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:14355: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14753: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:14360: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:14758: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_flags"
+@@ -14365,13 +14763,13 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-	echo "$as_me:14368: checking for XOpenDisplay" >&5
++	echo "$as_me:14766: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14374 "configure"
++#line 14772 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14402,16 +14800,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14405: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14803: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14408: \$? = $ac_status" >&5
++  echo "$as_me:14806: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14809: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14414: \$? = $ac_status" >&5
++  echo "$as_me:14812: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -14421,13 +14819,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14424: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:14822: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test $ac_cv_func_XOpenDisplay = yes; then
+   :
+ else
+ 
+-	echo "$as_me:14430: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:14828: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14435,7 +14833,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14438 "configure"
++#line 14836 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14454,16 +14852,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14457: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14855: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14460: \$? = $ac_status" >&5
++  echo "$as_me:14858: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14463: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14861: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14466: \$? = $ac_status" >&5
++  echo "$as_me:14864: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -14474,7 +14872,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14477: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:14875: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+ 
+@@ -14498,13 +14896,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:14501: checking for XtAppInitialize" >&5
++	echo "$as_me:14899: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14507 "configure"
++#line 14905 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14535,16 +14933,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14538: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14936: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14541: \$? = $ac_status" >&5
++  echo "$as_me:14939: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14544: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14547: \$? = $ac_status" >&5
++  echo "$as_me:14945: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -14554,13 +14952,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14557: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:14955: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test $ac_cv_func_XtAppInitialize = yes; then
+   :
+ else
+ 
+-	echo "$as_me:14563: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:14961: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14568,7 +14966,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14571 "configure"
++#line 14969 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14587,16 +14985,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14590: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14988: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14593: \$? = $ac_status" >&5
++  echo "$as_me:14991: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14596: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14599: \$? = $ac_status" >&5
++  echo "$as_me:14997: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -14607,7 +15005,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14610: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:15008: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
+ 
+@@ -14624,7 +15022,7 @@
+ fi
+ 
+ if test $cf_have_X_LIBS = no ; then
+-	{ echo "$as_me:14627: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:15025: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program.  You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -14665,14 +15063,14 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+ 
+-			echo "$as_me:14668: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:15066: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ 		else
+-			echo "$as_me:14671: checking for $cf_test" >&5
++			echo "$as_me:15069: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 14675 "configure"
++#line 15073 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14686,16 +15084,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15087: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14692: \$? = $ac_status" >&5
++  echo "$as_me:15090: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14698: \$? = $ac_status" >&5
++  echo "$as_me:15096: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14704,7 +15102,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-		echo "$as_me:14707: result: $cf_result" >&5
++		echo "$as_me:15105: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -14720,7 +15118,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:14723: WARNING: Unable to find Athena header files" >&5
++	{ echo "$as_me:15121: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ 
+@@ -14785,10 +15183,10 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-		echo "$as_me:14788: checking for $cf_test in $cf_libs" >&5
++		echo "$as_me:15186: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 14791 "configure"
++#line 15189 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14804,16 +15202,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14807: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15205: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14810: \$? = $ac_status" >&5
++  echo "$as_me:15208: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14813: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14816: \$? = $ac_status" >&5
++  echo "$as_me:15214: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14822,7 +15220,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:14825: result: $cf_result" >&5
++		echo "$as_me:15223: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -14839,7 +15237,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:14842: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:15240: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -14873,7 +15271,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:14876: checking for $ac_word" >&5
++echo "$as_me:15274: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14888,7 +15286,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:14891: found $ac_dir/$ac_word" >&5
++echo "$as_me:15289: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -14896,10 +15294,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:14899: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:15297: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:14902: result: no" >&5
++  echo "$as_me:15300: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -14912,7 +15310,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:14915: checking for $ac_word" >&5
++echo "$as_me:15313: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14927,7 +15325,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:14930: found $ac_dir/$ac_word" >&5
++echo "$as_me:15328: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -14935,10 +15333,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:14938: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:15336: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:14941: result: no" >&5
++  echo "$as_me:15339: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -15073,7 +15471,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15076: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15474: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15158,7 +15556,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15161: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15559: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15168,7 +15566,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15171: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15569: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15178,7 +15576,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15181: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15579: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -15187,7 +15585,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15190 "configure"
++#line 15588 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15199,16 +15597,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15202: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15600: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15205: \$? = $ac_status" >&5
++  echo "$as_me:15603: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15208: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15606: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15211: \$? = $ac_status" >&5
++  echo "$as_me:15609: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -15216,12 +15614,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15219: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15617: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15224: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15622: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_flags"
+@@ -15229,7 +15627,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:15232: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:15630: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15237,7 +15635,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15240 "configure"
++#line 15638 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15256,16 +15654,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15259: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15657: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15262: \$? = $ac_status" >&5
++  echo "$as_me:15660: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15265: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15663: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15268: \$? = $ac_status" >&5
++  echo "$as_me:15666: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -15276,7 +15674,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15279: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:15677: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+ 
+@@ -15298,7 +15696,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15301: checking for XCurses library" >&5
++echo "$as_me:15699: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15321,7 +15719,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15324 "configure"
++#line 15722 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15336,16 +15734,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15737: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15342: \$? = $ac_status" >&5
++  echo "$as_me:15740: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15743: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15348: \$? = $ac_status" >&5
++  echo "$as_me:15746: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -15356,7 +15754,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:15359: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:15757: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -15371,23 +15769,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:15374: checking for xcurses.h" >&5
++	echo "$as_me:15772: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15380 "configure"
++#line 15778 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15384: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15782: \"$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:15390: \$? = $ac_status" >&5
++  echo "$as_me:15788: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15406,7 +15804,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15409: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:15807: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test $ac_cv_header_xcurses_h = yes; then
+ 
+@@ -15417,14 +15815,14 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:15420: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:15818: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:15427: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:15825: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -15432,7 +15830,7 @@
+ 
+ : ${cf_nculib_root:=$cf_cv_screen}
+ as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
+-echo "$as_me:15435: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
++echo "$as_me:15833: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15440,7 +15838,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_nculib_root  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15443 "configure"
++#line 15841 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15459,16 +15857,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15462: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15860: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15465: \$? = $ac_status" >&5
++  echo "$as_me:15863: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15471: \$? = $ac_status" >&5
++  echo "$as_me:15869: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -15479,7 +15877,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15482: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:15880: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   cf_cv_ncurses_pthreads=yes
+@@ -15514,7 +15912,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15517: checking for X11 rgb file" >&5
++echo "$as_me:15915: checking for X11 rgb file" >&5
+ echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
+ 
+ # Check whether --with-x11-rgb or --without-x11-rgb was given.
+@@ -15578,7 +15976,7 @@
+ 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:15581: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:15979: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -15586,7 +15984,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15589: result: $RGB_PATH" >&5
++echo "$as_me:15987: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:16028: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -15644,7 +16042,7 @@
+ 	cf_enable_panel=$cf_default_panel
+ 
+ fi;
+-echo "$as_me:15647: result: $cf_enable_panel" >&5
++echo "$as_me:16045: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -15655,13 +16053,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:15658: checking pkg-config for panel$cf_cv_libtype" >&5
++	echo "$as_me:16056: checking pkg-config for panel$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for panel$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists panel$cf_cv_libtype ; then
+-		echo "$as_me:15661: result: yes" >&5
++		echo "$as_me:16059: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:15664: checking if the panel$cf_cv_libtype package files work" >&5
++		echo "$as_me:16062: checking if the panel$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the panel$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+@@ -15782,7 +16180,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15785 "configure"
++#line 16183 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15794,37 +16192,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15797: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16195: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15800: \$? = $ac_status" >&5
++  echo "$as_me:16198: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16201: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15806: \$? = $ac_status" >&5
++  echo "$as_me:16204: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15812 "configure"
++#line 16210 "configure"
+ #include "confdefs.h"
+ #include 
+ 				int main(void)
+ 				{ (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15819: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16217: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15822: \$? = $ac_status" >&5
++  echo "$as_me:16220: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15824: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16222: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15827: \$? = $ac_status" >&5
++  echo "$as_me:16225: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -15841,7 +16239,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:15844: result: $cf_have_curses_lib" >&5
++		echo "$as_me:16242: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" != "yes"
+@@ -15861,7 +16259,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:15864: checking for new_panel in -lpanel$cf_cv_libtype" >&5
++echo "$as_me:16262: checking for new_panel in -lpanel$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15869,7 +16267,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpanel$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15872 "configure"
++#line 16270 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15888,16 +16286,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15891: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16289: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15894: \$? = $ac_status" >&5
++  echo "$as_me:16292: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16295: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15900: \$? = $ac_status" >&5
++  echo "$as_me:16298: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -15908,7 +16306,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15911: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:16309: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -15941,7 +16339,7 @@
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+-echo "$as_me:15944: checking if you want to check for menu functions" >&5
++echo "$as_me:16342: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -15958,7 +16356,7 @@
+ 	cf_enable_menu=$cf_default_menu
+ 
+ fi;
+-echo "$as_me:15961: result: $cf_enable_menu" >&5
++echo "$as_me:16359: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -15967,14 +16365,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:15970: checking for NetBSD menu.h" >&5
++echo "$as_me:16368: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15977 "configure"
++#line 16375 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15992,16 +16390,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15995: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16393: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15998: \$? = $ac_status" >&5
++  echo "$as_me:16396: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16399: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16004: \$? = $ac_status" >&5
++  echo "$as_me:16402: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -16013,7 +16411,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16016: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:16414: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -16030,13 +16428,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:16033: checking pkg-config for menu$cf_cv_libtype" >&5
++	echo "$as_me:16431: checking pkg-config for menu$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for menu$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists menu$cf_cv_libtype ; then
+-		echo "$as_me:16036: result: yes" >&5
++		echo "$as_me:16434: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:16039: checking if the menu$cf_cv_libtype package files work" >&5
++		echo "$as_me:16437: checking if the menu$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the menu$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+@@ -16157,7 +16555,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16160 "configure"
++#line 16558 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -16169,37 +16567,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16570: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16175: \$? = $ac_status" >&5
++  echo "$as_me:16573: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16181: \$? = $ac_status" >&5
++  echo "$as_me:16579: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16187 "configure"
++#line 16585 "configure"
+ #include "confdefs.h"
+ #include 
+ 				int main(void)
+ 				{ (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16194: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16197: \$? = $ac_status" >&5
++  echo "$as_me:16595: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16597: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16202: \$? = $ac_status" >&5
++  echo "$as_me:16600: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -16216,7 +16614,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:16219: result: $cf_have_curses_lib" >&5
++		echo "$as_me:16617: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" != "yes"
+@@ -16236,7 +16634,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:16239: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
++echo "$as_me:16637: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16244,7 +16642,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmenu$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16247 "configure"
++#line 16645 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16263,16 +16661,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16266: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16664: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16269: \$? = $ac_status" >&5
++  echo "$as_me:16667: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16272: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16275: \$? = $ac_status" >&5
++  echo "$as_me:16673: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -16283,7 +16681,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16286: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:16684: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -16316,7 +16714,7 @@
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+-echo "$as_me:16319: checking if you want to check for form functions" >&5
++echo "$as_me:16717: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-form or --disable-form was given.
+@@ -16333,7 +16731,7 @@
+ 	cf_enable_form=$cf_default_form
+ 
+ fi;
+-echo "$as_me:16336: result: $cf_enable_form" >&5
++echo "$as_me:16734: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -16342,14 +16740,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:16345: checking for NetBSD form.h" >&5
++echo "$as_me:16743: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16352 "configure"
++#line 16750 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -16368,16 +16766,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16371: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16769: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16374: \$? = $ac_status" >&5
++  echo "$as_me:16772: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16377: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16775: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16380: \$? = $ac_status" >&5
++  echo "$as_me:16778: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -16389,7 +16787,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16392: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:16790: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -16406,13 +16804,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:16409: checking pkg-config for form$cf_cv_libtype" >&5
++	echo "$as_me:16807: checking pkg-config for form$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for form$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists form$cf_cv_libtype ; then
+-		echo "$as_me:16412: result: yes" >&5
++		echo "$as_me:16810: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:16415: checking if the form$cf_cv_libtype package files work" >&5
++		echo "$as_me:16813: checking if the form$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the form$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+@@ -16533,7 +16931,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16536 "configure"
++#line 16934 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -16545,37 +16943,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16548: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16946: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16551: \$? = $ac_status" >&5
++  echo "$as_me:16949: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16952: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16557: \$? = $ac_status" >&5
++  echo "$as_me:16955: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16563 "configure"
++#line 16961 "configure"
+ #include "confdefs.h"
+ #include 
+ 				int main(void)
+ 				{ (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16570: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16968: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16573: \$? = $ac_status" >&5
++  echo "$as_me:16971: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16973: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16578: \$? = $ac_status" >&5
++  echo "$as_me:16976: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -16592,7 +16990,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:16595: result: $cf_have_curses_lib" >&5
++		echo "$as_me:16993: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" != "yes"
+@@ -16612,7 +17010,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:16615: checking for form_driver in -lform$cf_cv_libtype" >&5
++echo "$as_me:17013: checking for form_driver in -lform$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16620,7 +17018,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lform$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16623 "configure"
++#line 17021 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16639,16 +17037,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16642: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17040: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16645: \$? = $ac_status" >&5
++  echo "$as_me:17043: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17046: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16651: \$? = $ac_status" >&5
++  echo "$as_me:17049: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -16659,7 +17057,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16662: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:17060: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -16697,23 +17095,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16700: checking for $ac_header" >&5
++echo "$as_me:17098: 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 16706 "configure"
++#line 17104 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:16710: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17108: \"$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:16716: \$? = $ac_status" >&5
++  echo "$as_me:17114: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16732,7 +17130,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16735: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17133: 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 <&5
++echo "$as_me:17143: 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 16751 "configure"
++#line 17149 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -16756,13 +17154,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16759: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17157: \"$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:16765: \$? = $ac_status" >&5
++  echo "$as_me:17163: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16784,7 +17182,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 16787 "configure"
++#line 17185 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16802,7 +17200,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 16805 "configure"
++#line 17203 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16823,7 +17221,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16826 "configure"
++#line 17224 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16849,15 +17247,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16852: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17250: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16855: \$? = $ac_status" >&5
++  echo "$as_me:17253: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16860: \$? = $ac_status" >&5
++  echo "$as_me:17258: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -16870,7 +17268,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16873: result: $ac_cv_header_stdc" >&5
++echo "$as_me:17271: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16880,13 +17278,13 @@
+ 
+ fi
+ 
+-echo "$as_me:16883: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17281: 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 16889 "configure"
++#line 17287 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -16902,16 +17300,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16905: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17303: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16908: \$? = $ac_status" >&5
++  echo "$as_me:17306: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17309: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16914: \$? = $ac_status" >&5
++  echo "$as_me:17312: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -16921,7 +17319,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:16924: result: $ac_cv_header_time" >&5
++echo "$as_me:17322: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -16945,23 +17343,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16948: checking for $ac_header" >&5
++echo "$as_me:17346: 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 16954 "configure"
++#line 17352 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:16958: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17356: \"$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:16964: \$? = $ac_status" >&5
++  echo "$as_me:17362: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16980,7 +17378,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16983: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17381: 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 <&5
++echo "$as_me:17394: 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 17002 "configure"
++#line 17400 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17006: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17404: \"$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:17012: \$? = $ac_status" >&5
++  echo "$as_me:17410: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17028,7 +17426,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17031: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17429: 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 <&5
++echo "$as_me:17439: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17048,7 +17446,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17051 "configure"
++#line 17449 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -17061,16 +17459,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17064: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17067: \$? = $ac_status" >&5
++  echo "$as_me:17465: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17073: \$? = $ac_status" >&5
++  echo "$as_me:17471: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -17082,7 +17480,7 @@
+ done
+ 
+ fi
+-echo "$as_me:17085: result: $cf_cv_getopt_header" >&5
++echo "$as_me:17483: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -17107,13 +17505,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17110: checking for $ac_func" >&5
++echo "$as_me:17508: 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 17116 "configure"
++#line 17514 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17144,16 +17542,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17147: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17150: \$? = $ac_status" >&5
++  echo "$as_me:17548: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17153: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17551: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17156: \$? = $ac_status" >&5
++  echo "$as_me:17554: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17163,7 +17561,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17166: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:17564: 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 <&5
++echo "$as_me:17575: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17184 "configure"
++#line 17582 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17202,16 +17600,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17603: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17208: \$? = $ac_status" >&5
++  echo "$as_me:17606: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17609: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17214: \$? = $ac_status" >&5
++  echo "$as_me:17612: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -17221,7 +17619,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17224: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:17622: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -17231,14 +17629,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:17234: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:17632: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17241 "configure"
++#line 17639 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17259,16 +17657,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17262: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17660: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17265: \$? = $ac_status" >&5
++  echo "$as_me:17663: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17666: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17271: \$? = $ac_status" >&5
++  echo "$as_me:17669: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -17278,7 +17676,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17281: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:17679: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17288,7 +17686,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:17291: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:17689: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -17307,13 +17705,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17310: checking for $ac_func" >&5
++echo "$as_me:17708: 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 17316 "configure"
++#line 17714 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17344,16 +17742,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17347: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17745: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17350: \$? = $ac_status" >&5
++  echo "$as_me:17748: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17353: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17751: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17356: \$? = $ac_status" >&5
++  echo "$as_me:17754: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17363,7 +17761,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17366: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:17764: 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 <&5
++echo "$as_me:17776: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17383,7 +17781,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17386 "configure"
++#line 17784 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17409,16 +17807,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17412: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17810: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17415: \$? = $ac_status" >&5
++  echo "$as_me:17813: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17421: \$? = $ac_status" >&5
++  echo "$as_me:17819: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -17428,7 +17826,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17431 "configure"
++#line 17829 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -17450,16 +17848,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17453: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17456: \$? = $ac_status" >&5
++  echo "$as_me:17854: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17459: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17462: \$? = $ac_status" >&5
++  echo "$as_me:17860: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -17473,7 +17871,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:17476: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:17874: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case $cf_cv_need_xopen_extension in
+@@ -17485,7 +17883,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17488: checking for term.h" >&5
++echo "$as_me:17886: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17506,7 +17904,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17509 "configure"
++#line 17907 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17520,16 +17918,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17523: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17921: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17526: \$? = $ac_status" >&5
++  echo "$as_me:17924: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17927: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17532: \$? = $ac_status" >&5
++  echo "$as_me:17930: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -17548,7 +17946,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17551 "configure"
++#line 17949 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17566,16 +17964,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17967: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17572: \$? = $ac_status" >&5
++  echo "$as_me:17970: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17973: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17578: \$? = $ac_status" >&5
++  echo "$as_me:17976: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -17590,7 +17988,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:17593: result: $cf_cv_term_header" >&5
++echo "$as_me:17991: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case $cf_cv_term_header in
+@@ -17617,7 +18015,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17620: checking for unctrl.h" >&5
++echo "$as_me:18018: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17638,7 +18036,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17641 "configure"
++#line 18039 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17652,16 +18050,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17655: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18053: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17658: \$? = $ac_status" >&5
++  echo "$as_me:18056: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17661: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18059: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17664: \$? = $ac_status" >&5
++  echo "$as_me:18062: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -17674,12 +18072,12 @@
+ done
+ 
+ fi
+-echo "$as_me:17677: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:18075: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case $cf_cv_unctrl_header in
+ (no)
+-	{ echo "$as_me:17682: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:18080: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -17768,10 +18166,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:17771: checking for ${cf_func}" >&5
++	echo "$as_me:18169: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:17774: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:18172: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17780,7 +18178,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 17783 "configure"
++#line 18181 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -17813,16 +18211,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17816: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18214: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17819: \$? = $ac_status" >&5
++  echo "$as_me:18217: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18220: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17825: \$? = $ac_status" >&5
++  echo "$as_me:18223: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -17838,7 +18236,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:17841: result: $cf_result" >&5
++	echo "$as_me:18239: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:18254: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:17859: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:18257: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17865,7 +18263,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 17868 "configure"
++#line 18266 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -17898,16 +18296,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17901: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18299: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17904: \$? = $ac_status" >&5
++  echo "$as_me:18302: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17907: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18305: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17910: \$? = $ac_status" >&5
++  echo "$as_me:18308: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -17923,7 +18321,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:17926: result: $cf_result" >&5
++	echo "$as_me:18324: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result != no; then
+ 		cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
+-#line 17950 "configure"
++#line 18348 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17967,21 +18365,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17970: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17973: \$? = $ac_status" >&5
++  echo "$as_me:18371: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17979: \$? = $ac_status" >&5
++  echo "$as_me:18377: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:17984: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:18382: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:18402: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18011 "configure"
++#line 18409 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18023,16 +18421,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18026: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18424: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18029: \$? = $ac_status" >&5
++  echo "$as_me:18427: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18032: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18035: \$? = $ac_status" >&5
++  echo "$as_me:18433: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -18040,7 +18438,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18043 "configure"
++#line 18441 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18065,16 +18463,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18068: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18466: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18071: \$? = $ac_status" >&5
++  echo "$as_me:18469: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18472: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18077: \$? = $ac_status" >&5
++  echo "$as_me:18475: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -18088,7 +18486,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18091: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:18489: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -18102,11 +18500,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:18105: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:18503: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18109 "configure"
++#line 18507 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18119,16 +18517,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18122: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18520: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18125: \$? = $ac_status" >&5
++  echo "$as_me:18523: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18526: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18131: \$? = $ac_status" >&5
++  echo "$as_me:18529: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -18137,7 +18535,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >conftest.$ac_ext <<_ACEOF
+-#line 18140 "configure"
++#line 18538 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18150,16 +18548,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18153: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18156: \$? = $ac_status" >&5
++  echo "$as_me:18554: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18162: \$? = $ac_status" >&5
++  echo "$as_me:18560: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -18170,7 +18568,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-		echo "$as_me:18173: result: $cf_define_xpg5" >&5
++		echo "$as_me:18571: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -18179,14 +18577,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:18182: checking for wide-character functions" >&5
++	echo "$as_me:18580: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18189 "configure"
++#line 18587 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18203,16 +18601,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18206: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18604: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18209: \$? = $ac_status" >&5
++  echo "$as_me:18607: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18212: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18215: \$? = $ac_status" >&5
++  echo "$as_me:18613: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -18223,7 +18621,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18226: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:18624: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -18244,14 +18642,14 @@
+ 
+ fi
+ 
+-echo "$as_me:18247: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:18645: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18254 "configure"
++#line 18652 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18269,16 +18667,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18272: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18275: \$? = $ac_status" >&5
++  echo "$as_me:18673: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18278: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18676: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18281: \$? = $ac_status" >&5
++  echo "$as_me:18679: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -18289,21 +18687,21 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18292: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:18690: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:18299: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:18697: 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 18306 "configure"
++#line 18704 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18323,16 +18721,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18326: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18724: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18329: \$? = $ac_status" >&5
++  echo "$as_me:18727: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18332: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18730: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18335: \$? = $ac_status" >&5
++  echo "$as_me:18733: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -18344,7 +18742,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18347: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:18745: 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
+@@ -18353,7 +18751,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:18356: checking for openpty in -lutil" >&5
++echo "$as_me:18754: 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
+@@ -18361,7 +18759,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18364 "configure"
++#line 18762 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18380,16 +18778,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18383: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18781: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18386: \$? = $ac_status" >&5
++  echo "$as_me:18784: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18389: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18787: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18392: \$? = $ac_status" >&5
++  echo "$as_me:18790: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -18400,7 +18798,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18403: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:18801: 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
+@@ -18408,7 +18806,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:18411: checking for openpty header" >&5
++echo "$as_me:18809: 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
+@@ -18435,7 +18833,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18438 "configure"
++#line 18836 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18452,16 +18850,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18455: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18853: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18458: \$? = $ac_status" >&5
++  echo "$as_me:18856: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18461: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18464: \$? = $ac_status" >&5
++  echo "$as_me:18862: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -18479,7 +18877,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:18482: result: $cf_cv_func_openpty" >&5
++echo "$as_me:18880: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -18513,7 +18911,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18516: checking for function curses_version" >&5
++echo "$as_me:18914: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18523,7 +18921,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18526 "configure"
++#line 18924 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18536,15 +18934,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18539: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18937: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18542: \$? = $ac_status" >&5
++  echo "$as_me:18940: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18544: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18547: \$? = $ac_status" >&5
++  echo "$as_me:18945: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -18559,14 +18957,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:18562: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:18960: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:18569: checking for alternate character set array" >&5
++echo "$as_me:18967: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18576,7 +18974,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18579 "configure"
++#line 18977 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18592,16 +18990,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18595: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18993: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18598: \$? = $ac_status" >&5
++  echo "$as_me:18996: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18999: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18604: \$? = $ac_status" >&5
++  echo "$as_me:19002: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -18612,7 +19010,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18615: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:19013: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -18622,7 +19020,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:18625: checking for wide alternate character set array" >&5
++echo "$as_me:19023: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18632,7 +19030,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18635 "configure"
++#line 19033 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -18648,16 +19046,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18651: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19049: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18654: \$? = $ac_status" >&5
++  echo "$as_me:19052: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18657: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19055: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18660: \$? = $ac_status" >&5
++  echo "$as_me:19058: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -18668,7 +19066,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	done
+ fi
+-echo "$as_me:18671: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:19069: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -18676,7 +19074,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:18679: checking for wide alternate character constants" >&5
++echo "$as_me:19077: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18686,7 +19084,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18689 "configure"
++#line 19087 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -18703,16 +19101,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18706: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19104: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18709: \$? = $ac_status" >&5
++  echo "$as_me:19107: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18712: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19110: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18715: \$? = $ac_status" >&5
++  echo "$as_me:19113: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -18722,7 +19120,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ else
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18725 "configure"
++#line 19123 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -18738,16 +19136,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18741: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19139: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18744: \$? = $ac_status" >&5
++  echo "$as_me:19142: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18747: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19145: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18750: \$? = $ac_status" >&5
++  echo "$as_me:19148: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -18758,7 +19156,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:18761: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:19159: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -18768,10 +19166,10 @@
+ 
+ fi
+ 
+-echo "$as_me:18771: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19169: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18774 "configure"
++#line 19172 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -18789,16 +19187,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18792: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19190: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18795: \$? = $ac_status" >&5
++  echo "$as_me:19193: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19196: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18801: \$? = $ac_status" >&5
++  echo "$as_me:19199: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -18807,7 +19205,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:18810: result: $cf_result" >&5
++echo "$as_me:19208: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -18828,14 +19226,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:18831: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:19229: 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 18838 "configure"
++#line 19236 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18853,23 +19251,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18856: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19254: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18859: \$? = $ac_status" >&5
++  echo "$as_me:19257: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18865: \$? = $ac_status" >&5
++  echo "$as_me:19263: \$? = $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 18872 "configure"
++#line 19270 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18888,16 +19286,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18891: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19289: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18894: \$? = $ac_status" >&5
++  echo "$as_me:19292: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19295: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18900: \$? = $ac_status" >&5
++  echo "$as_me:19298: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -18909,7 +19307,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:18912: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:19310: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -18932,14 +19330,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:18935: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:19333: 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 18942 "configure"
++#line 19340 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18957,23 +19355,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18960: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19358: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18963: \$? = $ac_status" >&5
++  echo "$as_me:19361: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18966: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19364: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18969: \$? = $ac_status" >&5
++  echo "$as_me:19367: \$? = $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 18976 "configure"
++#line 19374 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18992,16 +19390,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18995: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19393: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18998: \$? = $ac_status" >&5
++  echo "$as_me:19396: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19399: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19004: \$? = $ac_status" >&5
++  echo "$as_me:19402: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -19013,7 +19411,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:19016: result: $cf_cv_wchar_t" >&5
++echo "$as_me:19414: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -19036,14 +19434,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:19039: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:19437: 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 19046 "configure"
++#line 19444 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19061,23 +19459,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19064: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19462: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19067: \$? = $ac_status" >&5
++  echo "$as_me:19465: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19073: \$? = $ac_status" >&5
++  echo "$as_me:19471: \$? = $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 19080 "configure"
++#line 19478 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19096,16 +19494,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19099: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19497: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19102: \$? = $ac_status" >&5
++  echo "$as_me:19500: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19105: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19108: \$? = $ac_status" >&5
++  echo "$as_me:19506: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -19117,7 +19515,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:19120: result: $cf_cv_wint_t" >&5
++echo "$as_me:19518: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -19141,10 +19539,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:19144: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19542: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19147 "configure"
++#line 19545 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19162,16 +19560,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19165: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19563: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19168: \$? = $ac_status" >&5
++  echo "$as_me:19566: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19569: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19174: \$? = $ac_status" >&5
++  echo "$as_me:19572: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19180,7 +19578,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19183: result: $cf_result" >&5
++echo "$as_me:19581: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19202,10 +19600,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:19205: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19603: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19208 "configure"
++#line 19606 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19223,16 +19621,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19226: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19624: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19229: \$? = $ac_status" >&5
++  echo "$as_me:19627: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19232: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19630: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19235: \$? = $ac_status" >&5
++  echo "$as_me:19633: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19241,7 +19639,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19244: result: $cf_result" >&5
++echo "$as_me:19642: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19263,10 +19661,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:19266: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19664: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19269 "configure"
++#line 19667 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19284,16 +19682,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19287: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19290: \$? = $ac_status" >&5
++  echo "$as_me:19688: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19293: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19296: \$? = $ac_status" >&5
++  echo "$as_me:19694: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19302,7 +19700,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19305: result: $cf_result" >&5
++echo "$as_me:19703: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19331,11 +19729,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:19334: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19732: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19338 "configure"
++#line 19736 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19368,16 +19766,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19371: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19769: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19374: \$? = $ac_status" >&5
++  echo "$as_me:19772: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19377: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19775: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19380: \$? = $ac_status" >&5
++  echo "$as_me:19778: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ 
+@@ -19387,7 +19785,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19390: result: $cf_result" >&5
++echo "$as_me:19788: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test $cf_result = yes ; then
+@@ -19399,14 +19797,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:19402: checking for data $cf_data in library" >&5
++	echo "$as_me:19800: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19409 "configure"
++#line 19807 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19445,16 +19843,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19448: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19846: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19451: \$? = $ac_status" >&5
++  echo "$as_me:19849: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19454: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19852: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19457: \$? = $ac_status" >&5
++  echo "$as_me:19855: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19466,7 +19864,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19469 "configure"
++#line 19867 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19498,15 +19896,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19899: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19504: \$? = $ac_status" >&5
++  echo "$as_me:19902: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19904: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19509: \$? = $ac_status" >&5
++  echo "$as_me:19907: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ 
+@@ -19518,7 +19916,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-	echo "$as_me:19521: result: $cf_result" >&5
++	echo "$as_me:19919: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result = yes ; then
+ 
+@@ -19535,7 +19933,7 @@
+ 
+ if ( test "$GCC" = yes || test "$GXX" = yes )
+ then
+-echo "$as_me:19538: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:19936: checking if you want to turn on gcc warnings" >&5
+ echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -19552,7 +19950,7 @@
+ 	with_warnings=no
+ 
+ fi;
+-echo "$as_me:19555: result: $with_warnings" >&5
++echo "$as_me:19953: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ if test "$with_warnings" = "yes"
+ then
+@@ -19575,10 +19973,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:19578: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:19976: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:20028: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19633: \$? = $ac_status" >&5
++  echo "$as_me:20031: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:19635: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:20033: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -19710,7 +20108,7 @@
+ done
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19713 "configure"
++#line 20111 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19725,26 +20123,26 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19728: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20126: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19731: \$? = $ac_status" >&5
++  echo "$as_me:20129: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20132: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19737: \$? = $ac_status" >&5
++  echo "$as_me:20135: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-echo "$as_me:19740: checking for X11/Xt const-feature" >&5
++echo "$as_me:20138: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19747 "configure"
++#line 20145 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -19761,16 +20159,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19764: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20162: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19767: \$? = $ac_status" >&5
++  echo "$as_me:20165: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19770: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20168: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19773: \$? = $ac_status" >&5
++  echo "$as_me:20171: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -19785,7 +20183,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19788: result: $cf_cv_const_x_string" >&5
++echo "$as_me:20186: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -19814,7 +20212,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+  fi
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:20231: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -19846,12 +20244,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:19849: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:20247: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19852: \$? = $ac_status" >&5
++  echo "$as_me:20250: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:19854: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:20252: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -19859,7 +20257,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:19862: checking for $CC warning options..." >&5
++	{ echo "$as_me:20260: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -19883,12 +20281,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:19886: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:20284: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19889: \$? = $ac_status" >&5
++  echo "$as_me:20287: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:19891: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:20289: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Winline)
+@@ -19896,7 +20294,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:19899: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:20297: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -19906,7 +20304,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:19909: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:20307: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -19922,7 +20320,7 @@
+ fi
+ fi
+ 
+-echo "$as_me:19925: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:20323: 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.
+@@ -19939,7 +20337,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:19942: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:20340: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -20053,23 +20451,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:20056: checking for dmalloc.h" >&5
++	echo "$as_me:20454: 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 20062 "configure"
++#line 20460 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20066: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20464: \"$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:20072: \$? = $ac_status" >&5
++  echo "$as_me:20470: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20088,11 +20486,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20091: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:20489: 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:20095: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:20493: 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
+@@ -20100,7 +20498,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20103 "configure"
++#line 20501 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20119,16 +20517,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20520: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20125: \$? = $ac_status" >&5
++  echo "$as_me:20523: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20526: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20131: \$? = $ac_status" >&5
++  echo "$as_me:20529: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -20139,7 +20537,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20142: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:20540: 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 <&5
++echo "$as_me:20555: 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.
+@@ -20171,7 +20569,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:20174: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:20572: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -20285,23 +20683,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:20288: checking for dbmalloc.h" >&5
++	echo "$as_me:20686: 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 20294 "configure"
++#line 20692 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20298: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20696: \"$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:20304: \$? = $ac_status" >&5
++  echo "$as_me:20702: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20320,11 +20718,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20323: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:20721: 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:20327: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:20725: 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
+@@ -20332,7 +20730,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20335 "configure"
++#line 20733 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20351,16 +20749,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20354: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20752: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20357: \$? = $ac_status" >&5
++  echo "$as_me:20755: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20360: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20363: \$? = $ac_status" >&5
++  echo "$as_me:20761: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -20371,7 +20769,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20374: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:20772: 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 <&5
++echo "$as_me:20787: 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.
+@@ -20403,7 +20801,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:20406: result: ${with_valgrind:-no}" >&5
++echo "$as_me:20804: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -20516,7 +20914,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:20519: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:20917: 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.
+@@ -20526,7 +20924,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:20529: result: $with_no_leaks" >&5
++echo "$as_me:20927: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -20544,7 +20942,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:20547: checking for an rpath option" >&5
++	echo "$as_me:20945: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case $cf_cv_system_name in
+ 	(irix*)
+@@ -20575,12 +20973,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:20578: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:20976: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:20583: checking if we need a space after rpath option" >&5
++		echo "$as_me:20981: 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"
+ 
+@@ -20601,7 +20999,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 20604 "configure"
++#line 21002 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -20613,16 +21011,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20616: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21014: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20619: \$? = $ac_status" >&5
++  echo "$as_me:21017: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20625: \$? = $ac_status" >&5
++  echo "$as_me:21023: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_space=no
+ else
+@@ -20632,14 +21030,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:20635: result: $cf_rpath_space" >&5
++		echo "$as_me:21033: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:20642: checking if rpath-hack should be disabled" >&5
++echo "$as_me:21040: checking if rpath-hack should be disabled" >&5
+ echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+@@ -20656,21 +21054,21 @@
+ 	cf_disable_rpath_hack=no
+ 
+ fi;
+-echo "$as_me:20659: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:21057: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ if test "$cf_disable_rpath_hack" = no ; then
+ 
+-echo "$as_me:20663: checking for updated LDFLAGS" >&5
++echo "$as_me:21061: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LD_RPATH_OPT" ; then
+-	echo "$as_me:20666: result: maybe" >&5
++	echo "$as_me:21064: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+ 
+ 	for ac_prog in ldd
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:20673: checking for $ac_word" >&5
++echo "$as_me:21071: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20685,7 +21083,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_cf_ldd_prog="$ac_prog"
+-echo "$as_me:20688: found $ac_dir/$ac_word" >&5
++echo "$as_me:21086: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -20693,10 +21091,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:20696: result: $cf_ldd_prog" >&5
++  echo "$as_me:21094: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:20699: result: no" >&5
++  echo "$as_me:21097: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -20710,7 +21108,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20713 "configure"
++#line 21111 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -20722,16 +21120,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20725: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21123: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20728: \$? = $ac_status" >&5
++  echo "$as_me:21126: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20734: \$? = $ac_status" >&5
++  echo "$as_me:21132: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -20759,7 +21157,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:20762: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:21160: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -20771,11 +21169,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:20774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21172: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:20778: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21176: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -20812,7 +21210,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:20815: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:21213: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -20825,11 +21223,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:20828: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21226: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:20832: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:21230: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -20866,7 +21264,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:20869: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:21267: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -20879,14 +21277,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:20882: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:21280: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:20886: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21284: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:20889: result: no" >&5
++	echo "$as_me:21287: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -20976,7 +21374,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:20979: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:21377: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -21152,7 +21550,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:21155: error: ambiguous option: $1
++    { { echo "$as_me:21553: 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;}
+@@ -21171,7 +21569,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:21174: error: unrecognized option: $1
++  -*) { { echo "$as_me:21572: 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;}
+@@ -21221,7 +21619,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
+-  *) { { echo "$as_me:21224: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:21622: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -21517,7 +21915,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:21520: creating $ac_file" >&5
++    { echo "$as_me:21918: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -21535,7 +21933,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:21538: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:21936: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -21548,7 +21946,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:21551: error: cannot find input file: $f" >&5
++           { { echo "$as_me:21949: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -21564,7 +21962,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:21567: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:21965: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -21573,7 +21971,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:21576: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:21974: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -21610,7 +22008,7 @@
+             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:21613: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:22011: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -21621,7 +22019,7 @@
+     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:21624: WARNING: Some variables may not be substituted:
++      { echo "$as_me:22022: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -21670,7 +22068,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:21673: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:22071: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -21681,7 +22079,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:21684: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:22082: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -21694,7 +22092,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:21697: error: cannot find input file: $f" >&5
++           { { echo "$as_me:22095: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -21752,7 +22150,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:21755: $ac_file is unchanged" >&5
++      { echo "$as_me:22153: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/ncurses-6.2-20200301.patch b/ncurses-6.2-20200301.patch
new file mode 100644
index 0000000..16df016
--- /dev/null
+++ b/ncurses-6.2-20200301.patch
@@ -0,0 +1,210 @@
+# ncurses 6.2 - patch 20200301 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.2 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.2 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.2
+#	http://invisible-mirror.net/archives/ncurses/6.2 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200301.patch.gz
+# patch by Thomas E. Dickey 
+# created  Mon Mar  2 23:18:56 UTC 2020
+# ------------------------------------------------------------------------------
+# NEWS                             |    8 +++++++-
+# VERSION                          |    2 +-
+# dist.mk                          |    4 ++--
+# ncurses/base/lib_bkgd.c          |   12 +++++++++++-
+# package/debian-mingw/changelog   |    4 ++--
+# package/debian-mingw64/changelog |    4 ++--
+# package/debian/changelog         |    4 ++--
+# package/mingw-ncurses.nsi        |    4 ++--
+# package/mingw-ncurses.spec       |    2 +-
+# package/ncurses.spec             |    2 +-
+# package/ncursest.spec            |    2 +-
+# 11 files changed, 32 insertions(+), 16 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3455 
+--- ncurses-6.2-20200229+/NEWS	2020-02-29 23:15:52.000000000 +0000
++++ ncurses-6.2-20200301/NEWS	2020-03-02 01:55:08.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3455 2020/02/29 23:15:52 tom Exp $
++-- $Id: NEWS,v 1.3456 2020/03/02 01:55:08 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,12 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20200301
++	+ modify wbkgd() and wbkgrnd() to avoid storing a null in the
++	  background character, because it may be used in cases where the
++	  corresponding 0x80 is not treated as a null (report by Marc Rechte,
++	  cf: 20181208).
++
+ 20200229
+ 	+ modify CF_NCURSES_CONFIG to work around xcode's c99 "-W" option,
+ 	  which conflicts with conventional use for passing linker options.
+Index: VERSION
+--- ncurses-6.2-20200229+/VERSION	2020-02-29 12:43:09.000000000 +0000
++++ ncurses-6.2-20200301/VERSION	2020-03-02 01:55:47.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.2	20200229
++5:0:10	6.2	20200301
+Index: dist.mk
+Prereq:  1.1337 
+--- ncurses-6.2-20200229+/dist.mk	2020-02-29 12:43:09.000000000 +0000
++++ ncurses-6.2-20200301/dist.mk	2020-03-02 01:55:47.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1337 2020/02/29 12:43:09 tom Exp $
++# $Id: dist.mk,v 1.1338 2020/03/02 01:55:47 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 2
+-NCURSES_PATCH = 20200229
++NCURSES_PATCH = 20200301
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/base/lib_bkgd.c
+Prereq:  1.54 
+--- ncurses-6.2-20200229+/ncurses/base/lib_bkgd.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200301/ncurses/base/lib_bkgd.c	2020-03-02 01:34:48.000000000 +0000
+@@ -37,7 +37,9 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_bkgd.c,v 1.54 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_bkgd.c,v 1.55 2020/03/02 01:34:48 tom Exp $")
++
++static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
+ 
+ /*
+  * Set the window's background information.
+@@ -143,6 +145,14 @@
+ 	    SetPair(new_bkgd, 0);
+ 	}
+ 
++	/* avoid setting background-character to a null */
++	if (CharOf(new_bkgd) == 0) {
++	    NCURSES_CH_T tmp_bkgd = blank;
++	    SetAttr(tmp_bkgd, AttrOf(new_bkgd));
++	    SetPair(tmp_bkgd, GetPair(new_bkgd));
++	    new_bkgd = tmp_bkgd;
++	}
++
+ 	memset(&old_bkgd, 0, sizeof(old_bkgd));
+ 	(void) wgetbkgrnd(win, &old_bkgd);
+ 
+Index: package/debian-mingw/changelog
+--- ncurses-6.2-20200229+/package/debian-mingw/changelog	2020-02-29 12:43:09.000000000 +0000
++++ ncurses-6.2-20200301/package/debian-mingw/changelog	2020-03-02 01:55:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200229) unstable; urgency=low
++ncurses6 (6.2+20200301) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Feb 2020 07:43:09 -0500
++ -- Thomas E. Dickey   Sun, 01 Mar 2020 20:55:47 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.2-20200229+/package/debian-mingw64/changelog	2020-02-29 12:43:09.000000000 +0000
++++ ncurses-6.2-20200301/package/debian-mingw64/changelog	2020-03-02 01:55:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200229) unstable; urgency=low
++ncurses6 (6.2+20200301) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Feb 2020 07:43:09 -0500
++ -- Thomas E. Dickey   Sun, 01 Mar 2020 20:55:47 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.2-20200229+/package/debian/changelog	2020-02-29 12:43:09.000000000 +0000
++++ ncurses-6.2-20200301/package/debian/changelog	2020-03-02 01:55:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200229) unstable; urgency=low
++ncurses6 (6.2+20200301) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Feb 2020 07:43:09 -0500
++ -- Thomas E. Dickey   Sun, 01 Mar 2020 20:55:47 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.380 
+--- ncurses-6.2-20200229+/package/mingw-ncurses.nsi	2020-02-29 12:43:09.000000000 +0000
++++ ncurses-6.2-20200301/package/mingw-ncurses.nsi	2020-03-02 01:55:47.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.380 2020/02/29 12:43:09 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.381 2020/03/02 01:55:47 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "2"
+ !define VERSION_YYYY  "2020"
+-!define VERSION_MMDD  "0229"
++!define VERSION_MMDD  "0301"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.2-20200229+/package/mingw-ncurses.spec	2020-02-29 12:43:09.000000000 +0000
++++ ncurses-6.2-20200301/package/mingw-ncurses.spec	2020-03-02 01:55:47.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.2
+-Release: 20200229
++Release: 20200301
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.2-20200229+/package/ncurses.spec	2020-02-29 12:43:09.000000000 +0000
++++ ncurses-6.2-20200301/package/ncurses.spec	2020-03-02 01:55:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.2
+-Release: 20200229
++Release: 20200301
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.2-20200229+/package/ncursest.spec	2020-02-29 12:43:09.000000000 +0000
++++ ncurses-6.2-20200301/package/ncursest.spec	2020-03-02 01:55:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.2
+-Release: 20200229
++Release: 20200301
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.2-20200308.patch b/ncurses-6.2-20200308.patch
new file mode 100644
index 0000000..c080fca
--- /dev/null
+++ b/ncurses-6.2-20200308.patch
@@ -0,0 +1,27944 @@
+# ncurses 6.2 - patch 20200308 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.2 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.2 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.2
+#	http://invisible-mirror.net/archives/ncurses/6.2 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200308.patch.gz
+# patch by Thomas E. Dickey 
+# created  Mon Mar  9 00:21:51 UTC 2020
+# ------------------------------------------------------------------------------
+# INSTALL                               |   31 
+# NEWS                                  |    8 
+# VERSION                               |    2 
+# aclocal.m4                            |   68 
+# c++/Makefile.in                       |    8 
+# configure                             | 4625 ++++++++++++++++----------------
+# configure.in                          |   27 
+# dist.mk                               |    4 
+# include/ncurses_cfg.hin               |    4 
+# misc/gen-pkgconfig.in                 |   15 
+# package/debian-mingw/changelog        |    4 
+# package/debian-mingw/copyright        |    3 
+# package/debian-mingw64/changelog      |    4 
+# package/debian-mingw64/copyright      |    3 
+# package/debian/changelog              |    4 
+# package/debian/copyright              |    3 
+# package/mingw-ncurses.nsi             |    6 
+# package/mingw-ncurses.spec            |    2 
+# package/ncurses.spec                  |    2 
+# package/ncursest.spec                 |    2 
+# test/Makefile.in                      |    6 
+# test/aclocal.m4                       |   31 
+# test/configure                        | 3529 ++++++++++++------------
+# test/configure.in                     |   12 
+# test/package/debian-mingw/copyright   |    3 
+# test/package/debian-mingw64/copyright |    3 
+# test/package/debian/copyright         |    3 
+# test/tracemunch                       |    9 
+# 28 files changed, 4379 insertions(+), 4042 deletions(-)
+# ------------------------------------------------------------------------------
+Index: INSTALL
+Prereq:  1.217 
+--- ncurses-6.2-20200301+/INSTALL	2020-02-15 13:39:30.000000000 +0000
++++ ncurses-6.2-20200308/INSTALL	2020-03-08 14:27:08.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: INSTALL,v 1.217 2020/02/15 13:39:30 tom Exp $
++-- $Id: INSTALL,v 1.221 2020/03/08 14:27:08 tom Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -439,6 +439,23 @@
+ 	Without some special effort, it will either fail to compile at all,
+ 	or the compiler may find a different unctrl.h file.
+ 
++	In addition to the curses library, a system may provide its own
++	versions of the add-on libraries (form, menu, panel), which would
++	not be compatible with ncurses.  These options allow you to rename
++	ncurses' add-on libraries to avoid conflicts when linking:
++
++		--with-form-libname=XXX
++		--with-menu-libname=XXX
++		--with-panel-libname=XXX
++
++	Rather than renaming them abitrarily, a prefix or suffix is
++	recommended.  An "n" prefix provides consistency with ncurses versus
++	curses, i.e.,
++
++		--with-form-libname=nform
++		--with-menu-libname=nmenu
++		--with-panel-libname=npanel
++
+     --disable-relink
+ 	If --enable-rpath is given, the generated makefiles normally will
+ 	rebuild shared libraries during install.  Use this option to simply
+@@ -864,6 +881,9 @@
+ 	Specify a suffix for the ncursesw6-config file, etc., used to work
+ 	around conflicts with packages.
+ 
++    --with-cxx-libname=NAME
++	Override the basename of the ncurses++ library (default: "ncurses++")
++
+     --with-cxx-shared
+ 	When --with-shared is set, build libncurses++ as a shared library.
+ 	This implicitly relies upon building with gcc/g++, since other
+@@ -909,6 +929,9 @@
+ 
+ 	See also "--with-tic-path" and "--with-infocmp-path".
+ 
++    --with-form-libname=NAME
++	Override the basename of the form library (default: "form")
++
+     --with-gpm
+ 	use Alessandro Rubini's GPM library to provide mouse support on the
+ 	Linux console.  Prior to ncurses 5.5, this introduced a dependency on
+@@ -1043,6 +1066,9 @@
+ 	by running them through tbl to generate tables understandable by
+ 	nroff.
+ 
++    --with-menu-libname=NAME
++	Override the basename of the menu library (default: "menu")
++
+     --with-mmask-t=TYPE
+ 	Override type of mmask_t, which stores the mouse mask.  Prior to
+ 	ncurses 5.5, this was always unsigned long, but with ncurses 5.5, it
+@@ -1070,6 +1096,9 @@
+ 	those using termcap, do not use the higher speeds.  Your application
+ 	(or system, in general) may or may not.
+ 
++    --with-panel-libname=NAME
++	Override the basename of the panel library (default: "panel")
++
+     --with-pc-suffix=SUFFIX
+ 	If ".pc" files are installed, optionally add a suffix to the files
+ 	and corresponding package names to separate unusual configurations.
+Index: NEWS
+Prereq:  1.3456 
+--- ncurses-6.2-20200301+/NEWS	2020-03-02 01:55:08.000000000 +0000
++++ ncurses-6.2-20200308/NEWS	2020-03-08 14:28:23.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3456 2020/03/02 01:55:08 tom Exp $
++-- $Id: NEWS,v 1.3461 2020/03/08 14:28:23 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,12 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20200308
++	+ update copyright notices in test-packages.
++	+ modify tracemunch to guard against errors in its known_p1 table.
++	+ add several --with-xxx-libname options, to help with pkgsrc (prompted
++	  by discussion with Thomas Klausner).
++
+ 20200301
+ 	+ modify wbkgd() and wbkgrnd() to avoid storing a null in the
+ 	  background character, because it may be used in cases where the
+Index: VERSION
+--- ncurses-6.2-20200301+/VERSION	2020-03-02 01:55:47.000000000 +0000
++++ ncurses-6.2-20200308/VERSION	2020-03-08 14:28:23.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.2	20200301
++5:0:10	6.2	20200308
+Index: aclocal.m4
+Prereq:  1.897 
+--- ncurses-6.2-20200301+/aclocal.m4	2020-02-29 21:30:04.000000000 +0000
++++ ncurses-6.2-20200308/aclocal.m4	2020-03-08 01:05:14.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.897 2020/02/29 21:30:04 anonymous.maarten Exp $
++dnl $Id: aclocal.m4,v 1.903 2020/03/08 01:05:14 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -4015,7 +4015,7 @@
+ 	AC_SUBST(LIB_PREFIX)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIB_RULES version: 88 updated: 2018/08/18 12:19:21
++dnl CF_LIB_RULES version: 89 updated: 2020/03/07 20:05:14
+ 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
+@@ -4103,8 +4103,13 @@
+ 		for cf_item in $cf_LIST_MODELS
+ 		do
+ 			CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
+-			cf_libname=$cf_dir
+-			test "$cf_dir" = c++ && cf_libname=ncurses++
++			if test "$cf_dir" = "c++"
++			then
++				CF_MAP_LIB_BASENAME(cf_libname,cxx)
++			else
++				CF_MAP_LIB_BASENAME(cf_libname,$cf_dir)
++			fi
++			test -z "$cf_libname" && cf_libname="$cf_dir"
+ 			if test $cf_item = shared ; then
+ 				if test -n "${LIB_SUFFIX}"
+ 				then
+@@ -4282,8 +4287,10 @@
+ 					;;
+ 				esac
+ 			elif test $cf_dir = c++ ; then
+-				cf_libname=ncurses++$USE_LIB_SUFFIX
++				CF_MAP_LIB_BASENAME(cf_libname,cxx)
++				cf_libname=${cf_libname}$USE_LIB_SUFFIX
+ 			else
++				CF_MAP_LIB_BASENAME(cf_libname,$cf_dir)
+ 				cf_libname=${cf_libname}$USE_LIB_SUFFIX
+ 			fi
+ 			if test -n "${USE_ARG_SUFFIX}" ; then
+@@ -5481,6 +5488,17 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_MAP_LIB_BASENAME version: 1 updated: 2020/03/07 20:05:14
++dnl -------------------
++dnl Convert a default-libname to the actual one used via CF_WITH_LIB_BASENAME.
++dnl
++dnl $1 = variable to set
++dnl $2 = default-libname
++AC_DEFUN([CF_MAP_LIB_BASENAME],[
++CF_UPPER(cf_map_lib_basename,$2)
++eval $1=\$${cf_map_lib_basename}_NAME
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_MATH_LIB version: 9 updated: 2017/01/21 11:06:25
+ dnl -----------
+ dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
+@@ -7195,7 +7213,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SRC_MODULES version: 31 updated: 2019/09/21 18:08:42
++dnl CF_SRC_MODULES version: 32 updated: 2020/03/07 20:05:14
+ 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
+@@ -7249,14 +7267,15 @@
+ 			CF_UPPER(cf_have_include,$cf_dir)
+ 			AC_DEFINE_UNQUOTED(HAVE_${cf_have_include}_H)
+ 			AC_DEFINE_UNQUOTED(HAVE_LIB${cf_have_include})
+-			TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
+-			TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2"
++			CF_MAP_LIB_BASENAME(TEST_ROOT,$cf_dir)
++			TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TEST_ROOT}${DFT_DEP_SUFFIX} $TEST_DEPS"
++			TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${TEST_ROOT}${DFT_DEP_SUFFIX} $TEST_DEP2"
+ 			if test "$DFT_LWR_MODEL" = "libtool"; then
+ 				TEST_ARGS="${TEST_DEPS}"
+ 				TEST_ARG2="${TEST_DEP2}"
+ 			else
+-				TEST_ARGS="-l${cf_dir}${USE_ARG_SUFFIX} $TEST_ARGS"
+-				TEST_ARG2="-l${cf_dir}${USE_ARG_SUFFIX} $TEST_ARG2"
++				TEST_ARGS="-l${TEST_ROOT}${USE_ARG_SUFFIX} $TEST_ARGS"
++				TEST_ARG2="-l${TEST_ROOT}${USE_ARG_SUFFIX} $TEST_ARG2"
+ 			fi
+ 			PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}${USE_ARG_SUFFIX}"
+ 		fi
+@@ -8374,6 +8393,35 @@
+ AC_SUBST(LIBTOOL_OPTS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_WITH_LIB_BASENAME version: 1 updated: 2020/03/07 20:05:14
++dnl --------------------
++dnl Allow for overriding the basename of a library, i.e., the part to which
++dnl prefixes/suffixes are attached.
++dnl
++dnl $1 = variable to set
++dnl $2 = option name
++dnl $3 = default basename for library, if omitted use $2
++AC_DEFUN([CF_WITH_LIB_BASENAME],
++[
++AC_MSG_CHECKING(for desired basename for $2 library)
++AC_ARG_WITH($2-libname,
++	[  --with-$2-libname=XXX override ifelse($3,,$2,$3) basename of library],
++	[with_lib_basename=$withval],
++	[with_lib_basename=ifelse($3,,$2,$3)])
++$1="$with_lib_basename"
++
++case "x[$]$1" in
++(x|xno|xnone|xyes)
++	$1=ifelse($3,,$2,$3)
++	;;
++(*)
++	;;
++esac
++
++AC_MSG_RESULT([$]$1)
++AC_SUBST($1)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_WITH_LIB_PREFIX version: 1 updated: 2012/01/21 19:28:10
+ dnl ------------------
+ dnl Allow the library-prefix to be overridden.  OS/2 EMX originally had no
+Index: c++/Makefile.in
+Prereq:  1.121 
+--- ncurses-6.2-20200301+/c++/Makefile.in	2020-02-22 17:29:13.000000000 +0000
++++ ncurses-6.2-20200308/c++/Makefile.in	2020-03-08 16:13:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.121 2020/02/22 17:29:13 tom Exp $
++# $Id: Makefile.in,v 1.122 2020/03/08 16:13:11 tom Exp $
+ ##############################################################################
+ # Copyright 2018,2020 Thomas E. Dickey                                       #
+ # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
+@@ -114,7 +114,11 @@
+ 
+ LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
+ SHLIB_DIRS	= -L../lib
+-SHLIB_LIST	= $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
++SHLIB_LIST	= $(SHLIB_DIRS) \
++		-l@FORM_NAME@@USE_LIB_SUFFIX@ \
++		-l@MENU_NAME@@USE_LIB_SUFFIX@ \
++		-l@PANEL_NAME@@USE_LIB_SUFFIX@ \
++		-lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+ 
+ LIBROOT		= ncurses++
+ 
+Index: configure
+--- ncurses-6.2-20200301+/configure	2020-02-29 21:44:17.000000000 +0000
++++ ncurses-6.2-20200308/configure	2020-03-08 01:10:17.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.697 .
++# From configure.in Revision: 1.700 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20200111.
+ #
+@@ -860,6 +860,10 @@
+   --with-ada-objects=DIR  Ada objects are in DIR (default: PREFIX/lib/ada/adalib)
+   --with-ada-sharedlib=soname build shared-library (requires GNAT projects)
+   --with-ada-libname=XXX  override default Ada library-name
++  --with-form-libname=XXX override form basename of library
++  --with-menu-libname=XXX override menu basename of library
++  --with-panel-libname=XXX override panel basename of library
++  --with-cxx-libname=XXX override ncurses++ basename of library
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -1056,7 +1060,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:1059: loading site script $ac_site_file" >&5
++    { echo "$as_me:1063: 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"
+@@ -1067,7 +1071,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:1070: loading cache $cache_file" >&5
++    { echo "$as_me:1074: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -1075,7 +1079,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:1078: creating cache $cache_file" >&5
++  { echo "$as_me:1082: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -1091,21 +1095,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:1094: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:1098: 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:1098: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:1102: 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:1104: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1108: 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:1106:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1110:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:1108:   current value: $ac_new_val" >&5
++        { echo "$as_me:1112:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1124,9 +1128,9 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:1127: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1131: 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:1129: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1133: 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
+@@ -1147,10 +1151,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1150: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1154: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1153: \$? = $ac_status" >&5
++  echo "$as_me:1157: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   ac_path_separator=';'
+ else
+@@ -1163,7 +1167,7 @@
+ 
+ top_builddir=`pwd`
+ 
+-echo "$as_me:1166: checking for egrep" >&5
++echo "$as_me:1170: 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
+@@ -1173,11 +1177,11 @@
+ 		else ac_cv_prog_egrep='egrep'
+ 	fi
+ fi
+-echo "$as_me:1176: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:1180: 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:1180: error: No egrep program found" >&5
++	test -z "$EGREP" && { { echo "$as_me:1184: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -1187,11 +1191,11 @@
+ cf_cv_abi_version=${NCURSES_MAJOR}
+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
+ cf_cv_timestamp=`date`
+-echo "$as_me:1190: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:1194: 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
+ 
+ if test -f $srcdir/VERSION ; then
+-	echo "$as_me:1194: checking for package version" >&5
++	echo "$as_me:1198: checking for package version" >&5
+ echo $ECHO_N "checking for package version... $ECHO_C" >&6
+ 
+ 	# if there are not enough fields, cut returns the last one...
+@@ -1203,39 +1207,39 @@
+ 	VERSION="$cf_field1"
+ 
+ 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
+-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1206: error: missing major-version" >&5
++	test -z "$VERSION_MAJOR" && { { echo "$as_me:1210: error: missing major-version" >&5
+ echo "$as_me: error: missing major-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ 	VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
+-	test -z "$VERSION_MINOR" && { { echo "$as_me:1211: error: missing minor-version" >&5
++	test -z "$VERSION_MINOR" && { { echo "$as_me:1215: error: missing minor-version" >&5
+ echo "$as_me: error: missing minor-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-	echo "$as_me:1215: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
++	echo "$as_me:1219: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+ echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
+ 
+-	echo "$as_me:1218: checking for package patch date" >&5
++	echo "$as_me:1222: checking for package patch date" >&5
+ echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
+ 	VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
+ 	case .$VERSION_PATCH in
+ 	(.)
+-		{ { echo "$as_me:1223: error: missing patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1227: error: missing patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	(.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+ 		;;
+ 	(*)
+-		{ { echo "$as_me:1230: error: illegal patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1234: error: illegal patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	esac
+-	echo "$as_me:1235: result: $VERSION_PATCH" >&5
++	echo "$as_me:1239: result: $VERSION_PATCH" >&5
+ echo "${ECHO_T}$VERSION_PATCH" >&6
+ else
+-	{ { echo "$as_me:1238: error: did not find $srcdir/VERSION" >&5
++	{ { echo "$as_me:1242: error: did not find $srcdir/VERSION" >&5
+ echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1243,19 +1247,19 @@
+ # show the actual data that we have for versions:
+ test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:1246: testing ABI VERSION $VERSION ..." 1>&5
++echo "${as_me:-configure}:1250: testing ABI VERSION $VERSION ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
+ 
+-echo "${as_me:-configure}:1250: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
++echo "${as_me:-configure}:1254: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
+ 
+-echo "${as_me:-configure}:1254: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
++echo "${as_me:-configure}:1258: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
+ 
+-echo "${as_me:-configure}:1258: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
++echo "${as_me:-configure}:1262: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+ 
+ 	cf_PACKAGE=NCURSES
+ 	PACKAGE=ncurses
+@@ -1279,7 +1283,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:1282: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++  { echo "$as_me:1286: 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;
+@@ -1292,13 +1296,13 @@
+   ([0-9]*)
+  	;;
+   (*)
+-	{ { echo "$as_me:1295: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++	{ { echo "$as_me:1299: 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:1301: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1305: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1308,13 +1312,13 @@
+   ([0-9]*)
+  	;;
+   (*)
+-	{ { echo "$as_me:1311: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++	{ { echo "$as_me:1315: 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:1317: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1321: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1327,7 +1331,7 @@
+ 
+ 	if test "x$cf_cv_abi_version" != "x$withval"
+ 	then
+-		{ echo "$as_me:1330: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1334: 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;}
+ 		case $cf_cv_rel_version in
+ 		(5.*)
+@@ -1346,13 +1350,13 @@
+   ([0-9]*)
+  	;;
+   (*)
+-	{ { echo "$as_me:1349: error: ABI version is not a number: $cf_cv_abi_version" >&5
++	{ { echo "$as_me:1353: 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:1355: error: ABI version value is empty" >&5
++  { { echo "$as_me:1359: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1383,7 +1387,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1386: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1390: 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
+@@ -1393,11 +1397,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1396: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1400: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1400: checking build system type" >&5
++echo "$as_me:1404: 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
+@@ -1406,23 +1410,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1409: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1413: 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:1413: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1417: 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:1418: result: $ac_cv_build" >&5
++echo "$as_me:1422: 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:1425: checking host system type" >&5
++echo "$as_me:1429: 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
+@@ -1431,12 +1435,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:1434: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1438: 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:1439: result: $ac_cv_host" >&5
++echo "$as_me:1443: 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/'`
+@@ -1444,7 +1448,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:1447: checking target system type" >&5
++	echo "$as_me:1451: 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
+@@ -1453,12 +1457,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:1456: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1460: 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:1461: result: $ac_cv_target" >&5
++echo "$as_me:1465: 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/'`
+@@ -1490,13 +1494,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1493: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1497: 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:1497: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1501: 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:1499: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1503: 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
+@@ -1504,7 +1508,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:1507: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1511: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+ 	cf_cv_system_name=$withval
+ 	host_os=$withval
+@@ -1516,7 +1520,7 @@
+ 
+ ###	Default install-location
+ 
+-echo "$as_me:1519: checking for prefix" >&5
++echo "$as_me:1523: 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
+@@ -1528,11 +1532,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1531: result: $prefix" >&5
++echo "$as_me:1535: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1535: checking for default include-directory" >&5
++echo "$as_me:1539: 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 \
+@@ -1555,7 +1559,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1558: result: $includedir" >&5
++echo "$as_me:1562: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1618,7 +1622,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:1621: checking for $ac_word" >&5
++echo "$as_me:1625: 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
+@@ -1633,7 +1637,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:1636: found $ac_dir/$ac_word" >&5
++echo "$as_me:1640: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1641,10 +1645,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1644: result: $CC" >&5
++  echo "$as_me:1648: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1647: result: no" >&5
++  echo "$as_me:1651: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1657,7 +1661,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:1660: checking for $ac_word" >&5
++echo "$as_me:1664: 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
+@@ -1672,7 +1676,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:1675: found $ac_dir/$ac_word" >&5
++echo "$as_me:1679: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1680,10 +1684,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1683: result: $ac_ct_CC" >&5
++  echo "$as_me:1687: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1686: result: no" >&5
++  echo "$as_me:1690: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1693,32 +1697,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1696: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1700: error: no acceptable cc found in \$PATH" >&5
+ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:1701:" \
++echo "$as_me:1705:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1704: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:1708: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1707: \$? = $ac_status" >&5
++  echo "$as_me:1711: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1709: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:1713: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1712: \$? = $ac_status" >&5
++  echo "$as_me:1716: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1714: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:1718: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1717: \$? = $ac_status" >&5
++  echo "$as_me:1721: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1721 "configure"
++#line 1725 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1734,13 +1738,13 @@
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:1737: checking for C compiler default output" >&5
++echo "$as_me:1741: checking for C compiler default output" >&5
+ echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:1740: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1744: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1743: \$? = $ac_status" >&5
++  echo "$as_me:1747: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # Find the output, starting from the most likely.  This scheme is
+ # not robust to junk in `.', hence go to wildcards (a.*) only as a last
+@@ -1763,34 +1767,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1766: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1770: error: C compiler cannot create executables" >&5
+ echo "$as_me: error: C compiler cannot create executables" >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:1772: result: $ac_file" >&5
++echo "$as_me:1776: result: $ac_file" >&5
+ echo "${ECHO_T}$ac_file" >&6
+ 
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1777: checking whether the C compiler works" >&5
++echo "$as_me:1781: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:1783: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1787: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1786: \$? = $ac_status" >&5
++  echo "$as_me:1790: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1793: error: cannot run C compiled programs.
++	{ { echo "$as_me:1797: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&2;}
+@@ -1798,24 +1802,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1801: result: yes" >&5
++echo "$as_me:1805: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+ rm -f a.out a.exe conftest$ac_cv_exeext
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1808: checking whether we are cross compiling" >&5
++echo "$as_me:1812: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1810: result: $cross_compiling" >&5
++echo "$as_me:1814: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1813: checking for executable suffix" >&5
++echo "$as_me:1817: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1815: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1819: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1818: \$? = $ac_status" >&5
++  echo "$as_me:1822: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+@@ -1831,25 +1835,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1834: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1838: error: cannot compute EXEEXT: cannot compile and link" >&5
+ echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-echo "$as_me:1840: result: $ac_cv_exeext" >&5
++echo "$as_me:1844: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:1846: checking for object suffix" >&5
++echo "$as_me:1850: checking for object suffix" >&5
+ echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1852 "configure"
++#line 1856 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1861,10 +1865,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1868: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1867: \$? = $ac_status" >&5
++  echo "$as_me:1871: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+@@ -1876,24 +1880,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1879: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1883: error: cannot compute OBJEXT: cannot compile" >&5
+ echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1886: result: $ac_cv_objext" >&5
++echo "$as_me:1890: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1890: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1894: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1896 "configure"
++#line 1900 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1908,16 +1912,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1915: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1914: \$? = $ac_status" >&5
++  echo "$as_me:1918: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1921: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1920: \$? = $ac_status" >&5
++  echo "$as_me:1924: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1929,19 +1933,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1932: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1936: result: $ac_cv_c_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+-echo "$as_me:1938: checking whether $CC accepts -g" >&5
++echo "$as_me:1942: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1944 "configure"
++#line 1948 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1953,16 +1957,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1960: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1959: \$? = $ac_status" >&5
++  echo "$as_me:1963: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1966: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1965: \$? = $ac_status" >&5
++  echo "$as_me:1969: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1972,7 +1976,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1975: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1979: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -1999,16 +2003,16 @@
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2002: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2006: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2005: \$? = $ac_status" >&5
++  echo "$as_me:2009: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2011: \$? = $ac_status" >&5
++  echo "$as_me:2015: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2020,7 +2024,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2023 "configure"
++#line 2027 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2033,16 +2037,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2036: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2040: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2039: \$? = $ac_status" >&5
++  echo "$as_me:2043: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2042: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2046: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2045: \$? = $ac_status" >&5
++  echo "$as_me:2049: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2052,7 +2056,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2055 "configure"
++#line 2059 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2064,16 +2068,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2071: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2070: \$? = $ac_status" >&5
++  echo "$as_me:2074: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2076: \$? = $ac_status" >&5
++  echo "$as_me:2080: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -2103,11 +2107,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2106: checking version of $CC" >&5
++	echo "$as_me:2110: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2110: result: $GCC_VERSION" >&5
++	echo "$as_me:2114: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2116,12 +2120,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:2119: checking if this is really Intel C compiler" >&5
++		echo "$as_me:2123: 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 2124 "configure"
++#line 2128 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2138,16 +2142,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2141: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2145: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2144: \$? = $ac_status" >&5
++  echo "$as_me:2148: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2147: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2150: \$? = $ac_status" >&5
++  echo "$as_me:2154: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2158,7 +2162,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:2161: result: $INTEL_COMPILER" >&5
++		echo "$as_me:2165: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -2167,12 +2171,12 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2170: checking if this is really Clang C compiler" >&5
++	echo "$as_me:2174: checking if this is really Clang C compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	CFLAGS="$CFLAGS -Qunused-arguments"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 2175 "configure"
++#line 2179 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2189,16 +2193,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2192: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2196: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2195: \$? = $ac_status" >&5
++  echo "$as_me:2199: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2198: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2202: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2201: \$? = $ac_status" >&5
++  echo "$as_me:2205: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -2209,11 +2213,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2212: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2216: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+-echo "$as_me:2216: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2220: 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
+@@ -2221,7 +2225,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2224 "configure"
++#line 2228 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2270,16 +2274,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2273: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2277: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2276: \$? = $ac_status" >&5
++  echo "$as_me:2280: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2279: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2283: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2282: \$? = $ac_status" >&5
++  echo "$as_me:2286: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2296,10 +2300,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2299: result: none needed" >&5
++    echo "$as_me:2303: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2302: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2306: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2307,13 +2311,13 @@
+ # This should have been defined by AC_PROG_CC
+ : ${CC:=cc}
+ 
+-echo "$as_me:2310: checking \$CFLAGS variable" >&5
++echo "$as_me:2314: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2314: result: broken" >&5
++	echo "$as_me:2318: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2316: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2320: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+ echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
+ 	cf_flags="$CFLAGS"
+ 	CFLAGS=
+@@ -2421,18 +2425,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:2424: result: ok" >&5
++	echo "$as_me:2428: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2429: checking \$CC variable" >&5
++echo "$as_me:2433: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2433: result: broken" >&5
++	echo "$as_me:2437: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2435: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2439: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+ echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
+ 	# humor him...
+ 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
+@@ -2549,19 +2553,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2552: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2556: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2556: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2560: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2560: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2564: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2564: result: ok" >&5
++	echo "$as_me:2568: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -2572,7 +2576,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:2575: checking how to run the C preprocessor" >&5
++echo "$as_me:2579: 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
+@@ -2593,18 +2597,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 2596 "configure"
++#line 2600 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2601: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2605: \"$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:2607: \$? = $ac_status" >&5
++  echo "$as_me:2611: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2627,17 +2631,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2630 "configure"
++#line 2634 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2634: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2638: \"$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:2640: \$? = $ac_status" >&5
++  echo "$as_me:2644: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2674,7 +2678,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2677: result: $CPP" >&5
++echo "$as_me:2681: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2684,18 +2688,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 2687 "configure"
++#line 2691 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2692: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2696: \"$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:2698: \$? = $ac_status" >&5
++  echo "$as_me:2702: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2718,17 +2722,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2721 "configure"
++#line 2725 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2725: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2729: \"$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:2731: \$? = $ac_status" >&5
++  echo "$as_me:2735: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2756,7 +2760,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2759: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2763: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2769,14 +2773,14 @@
+ ac_main_return=return
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:2772: checking whether $CC needs -traditional" >&5
++    echo "$as_me:2776: 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 2779 "configure"
++#line 2783 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TIOCGETP;
+@@ -2791,7 +2795,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 2794 "configure"
++#line 2798 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TCGETA;
+@@ -2804,14 +2808,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:2807: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:2811: 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:2814: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:2818: 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
+@@ -2826,15 +2830,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 $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:2829: \"$ac_try\"") >&5
++if { (eval echo "$as_me:2833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2832: \$? = $ac_status" >&5
++  echo "$as_me:2836: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2834: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:2838: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2837: \$? = $ac_status" >&5
++  echo "$as_me:2841: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -2845,10 +2849,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CC_c_o = yes; then
+-  echo "$as_me:2848: result: yes" >&5
++  echo "$as_me:2852: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:2851: result: no" >&5
++  echo "$as_me:2855: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2862,7 +2866,7 @@
+ 	(*) 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:2865: checking for $ac_word" >&5
++echo "$as_me:2869: 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
+@@ -2879,7 +2883,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:2882: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2886: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2890,10 +2894,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:2893: result: $LDCONFIG" >&5
++  echo "$as_me:2897: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:2896: result: no" >&5
++  echo "$as_me:2900: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2901,7 +2905,7 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:2904: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:2908: 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.
+@@ -2911,7 +2915,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:2914: result: $cf_with_cxx" >&5
++echo "$as_me:2918: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -2929,7 +2933,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:2932: checking for $ac_word" >&5
++echo "$as_me:2936: 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
+@@ -2944,7 +2948,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:2947: found $ac_dir/$ac_word" >&5
++echo "$as_me:2951: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2952,10 +2956,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:2955: result: $CXX" >&5
++  echo "$as_me:2959: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:2958: result: no" >&5
++  echo "$as_me:2962: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2968,7 +2972,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:2971: checking for $ac_word" >&5
++echo "$as_me:2975: 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
+@@ -2983,7 +2987,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:2986: found $ac_dir/$ac_word" >&5
++echo "$as_me:2990: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2991,10 +2995,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:2994: result: $ac_ct_CXX" >&5
++  echo "$as_me:2998: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:2997: result: no" >&5
++  echo "$as_me:3001: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3006,32 +3010,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:3009:" \
++echo "$as_me:3013:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:3012: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:3016: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3015: \$? = $ac_status" >&5
++  echo "$as_me:3019: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:3017: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:3021: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3020: \$? = $ac_status" >&5
++  echo "$as_me:3024: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:3022: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:3026: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3025: \$? = $ac_status" >&5
++  echo "$as_me:3029: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:3028: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:3032: 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 3034 "configure"
++#line 3038 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3046,16 +3050,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3049: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3053: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3052: \$? = $ac_status" >&5
++  echo "$as_me:3056: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3059: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3058: \$? = $ac_status" >&5
++  echo "$as_me:3062: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -3067,19 +3071,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:3070: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:3074: 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:3076: checking whether $CXX accepts -g" >&5
++echo "$as_me:3080: 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 3082 "configure"
++#line 3086 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3091,16 +3095,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3094: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3098: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3097: \$? = $ac_status" >&5
++  echo "$as_me:3101: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3104: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3103: \$? = $ac_status" >&5
++  echo "$as_me:3107: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -3110,7 +3114,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3113: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:3117: 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
+@@ -3137,7 +3141,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3140 "configure"
++#line 3144 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -3150,16 +3154,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3153: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3157: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3156: \$? = $ac_status" >&5
++  echo "$as_me:3160: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3162: \$? = $ac_status" >&5
++  echo "$as_me:3166: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3169,7 +3173,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3172 "configure"
++#line 3176 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -3181,16 +3185,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3184: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3188: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3187: \$? = $ac_status" >&5
++  echo "$as_me:3191: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3190: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3194: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3193: \$? = $ac_status" >&5
++  echo "$as_me:3197: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -3224,7 +3228,7 @@
+ 	then
+ 		# Several of the C++ configurations do not work, particularly when
+ 		# cross-compiling (20140913 -TD)
+-		echo "$as_me:3227: checking if $CXX works" >&5
++		echo "$as_me:3231: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+ 		save_CPPFLAGS="$CPPFLAGS"
+@@ -3232,7 +3236,7 @@
+ 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3235 "configure"
++#line 3239 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -3249,16 +3253,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3252: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3256: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3255: \$? = $ac_status" >&5
++  echo "$as_me:3259: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3261: \$? = $ac_status" >&5
++  echo "$as_me:3265: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_works=yes
+ else
+@@ -3269,11 +3273,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 
+-		echo "$as_me:3272: result: $cf_cxx_works" >&5
++		echo "$as_me:3276: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ 		if test "x$cf_cxx_works" = xno
+ 		then
+-			{ echo "$as_me:3276: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++			{ echo "$as_me:3280: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+ echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
+ 			cf_with_cxx=no; CXX=""; GXX="";
+ 		fi
+@@ -3289,7 +3293,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:3292: checking for $ac_word" >&5
++echo "$as_me:3296: 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
+@@ -3306,7 +3310,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:3309: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3313: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3317,17 +3321,17 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3320: result: $CXX" >&5
++  echo "$as_me:3324: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3323: result: no" >&5
++  echo "$as_me:3327: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	case "x$CXX" in
+ 	(x|xg++)
+-		{ echo "$as_me:3330: WARNING: You don't have any C++ compiler, too bad" >&5
++		{ echo "$as_me:3334: WARNING: You don't have any C++ compiler, too bad" >&5
+ echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
+ 		cf_with_cxx=no; CXX=""; GXX="";
+ 		;;
+@@ -3336,7 +3340,7 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3339: checking version of ${CXX:-g++}" >&5
++	echo "$as_me:3343: checking version of ${CXX:-g++}" >&5
+ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
+ 	GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	if test -z "$GXX_VERSION"
+@@ -3344,7 +3348,7 @@
+ 		GXX_VERSION=unknown
+ 		GXX=no
+ 	fi
+-	echo "$as_me:3347: result: $GXX_VERSION" >&5
++	echo "$as_me:3351: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3352,12 +3356,12 @@
+ (1*|2.[0-6]*)
+ 	# GXX=""; CXX=""; ac_cv_prog_gxx=no
+ 	# cf_cxx_library=no
+-	{ echo "$as_me:3355: WARNING: templates do not work" >&5
++	{ echo "$as_me:3359: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3360: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3364: 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.
+@@ -3367,15 +3371,15 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3370: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3374: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3373: checking if you want to build with Ada" >&5
++echo "$as_me:3377: checking if you want to build with Ada" >&5
+ echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
+-echo "$as_me:3375: result: $cf_with_ada" >&5
++echo "$as_me:3379: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3378: checking if you want to install terminal database" >&5
++echo "$as_me:3382: checking if you want to install terminal database" >&5
+ echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
+ 
+ # Check whether --enable-db-install or --disable-db-install was given.
+@@ -3385,10 +3389,10 @@
+ else
+   cf_with_db_install=yes
+ fi;
+-echo "$as_me:3388: result: $cf_with_db_install" >&5
++echo "$as_me:3392: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+ 
+-echo "$as_me:3391: checking if you want to install manpages" >&5
++echo "$as_me:3395: 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.
+@@ -3398,10 +3402,10 @@
+ else
+   cf_with_manpages=yes
+ fi;
+-echo "$as_me:3401: result: $cf_with_manpages" >&5
++echo "$as_me:3405: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+ 
+-echo "$as_me:3404: checking if you want to build programs such as tic" >&5
++echo "$as_me:3408: 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.
+@@ -3411,18 +3415,18 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:3414: result: $cf_with_progs" >&5
++echo "$as_me:3418: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+ if test -f $srcdir/tack/tack.h; then
+ 	if test "x$cross_compiling" = xyes ; then
+ 		test -n "$verbose" && echo "	ignoring tack because we are cross-compiling" 1>&6
+ 
+-echo "${as_me:-configure}:3421: testing ignoring tack because we are cross-compiling ..." 1>&5
++echo "${as_me:-configure}:3425: testing ignoring tack because we are cross-compiling ..." 1>&5
+ 
+ 		cf_with_tack=no
+ 	else
+-		echo "$as_me:3425: checking if you want to build the tack program" >&5
++		echo "$as_me:3429: checking if you want to build the tack program" >&5
+ echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6
+ 
+ # Check whether --with-tack or --without-tack was given.
+@@ -3432,14 +3436,14 @@
+ else
+   cf_with_tack=$cf_with_progs
+ fi;
+-		echo "$as_me:3435: result: $cf_with_tack" >&5
++		echo "$as_me:3439: result: $cf_with_tack" >&5
+ echo "${ECHO_T}$cf_with_tack" >&6
+ 	fi
+ else
+ 	cf_with_tack=no
+ fi
+ 
+-echo "$as_me:3442: checking if you want to build test-programs" >&5
++echo "$as_me:3446: checking if you want to build test-programs" >&5
+ echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
+ 
+ # Check whether --with-tests or --without-tests was given.
+@@ -3449,10 +3453,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3452: result: $cf_with_tests" >&5
++echo "$as_me:3456: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3455: checking if you wish to install curses.h" >&5
++echo "$as_me:3459: 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.
+@@ -3462,7 +3466,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:3465: result: $with_curses_h" >&5
++echo "$as_me:3469: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -3487,7 +3491,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:3490: checking for $ac_word" >&5
++echo "$as_me:3494: 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
+@@ -3502,7 +3506,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3505: found $ac_dir/$ac_word" >&5
++echo "$as_me:3509: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3510,21 +3514,21 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:3513: result: $AWK" >&5
++  echo "$as_me:3517: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:3516: result: no" >&5
++  echo "$as_me:3520: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:3523: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3527: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:3527: checking for egrep" >&5
++echo "$as_me:3531: 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
+@@ -3534,11 +3538,11 @@
+ 		else ac_cv_prog_egrep='egrep'
+ 	fi
+ fi
+-echo "$as_me:3537: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3541: 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:3541: error: No egrep program found" >&5
++	test -z "$EGREP" && { { echo "$as_me:3545: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -3554,7 +3558,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:3557: checking for a BSD compatible install" >&5
++echo "$as_me:3561: 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
+@@ -3603,7 +3607,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3606: result: $INSTALL" >&5
++echo "$as_me:3610: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3628,7 +3632,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:3631: checking for $ac_word" >&5
++echo "$as_me:3635: 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
+@@ -3643,7 +3647,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3646: found $ac_dir/$ac_word" >&5
++echo "$as_me:3650: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3651,10 +3655,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:3654: result: $LINT" >&5
++  echo "$as_me:3658: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:3657: result: no" >&5
++  echo "$as_me:3661: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3667,18 +3671,18 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3670: checking whether ln -s works" >&5
++echo "$as_me:3674: 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:3674: result: yes" >&5
++  echo "$as_me:3678: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3677: result: no, using $LN_S" >&5
++  echo "$as_me:3681: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:3681: checking if $LN_S -f options work" >&5
++echo "$as_me:3685: checking if $LN_S -f options work" >&5
+ echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
+ 
+ rm -f conf$$.src conf$$dst
+@@ -3690,12 +3694,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:3693: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3697: result: $cf_prog_ln_sf" >&5
+ echo "${ECHO_T}$cf_prog_ln_sf" >&6
+ 
+ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+ 
+-echo "$as_me:3698: checking for long file names" >&5
++echo "$as_me:3702: 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
+@@ -3734,7 +3738,7 @@
+   rm -rf $ac_xdir 2>/dev/null
+ done
+ fi
+-echo "$as_me:3737: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3741: 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
+ 
+@@ -3753,7 +3757,7 @@
+   withval="$with_config_suffix"
+   case "x$withval" in
+ 	(xyes|xno)
+-		{ echo "$as_me:3756: WARNING: expected a value for config-suffix option" >&5
++		{ echo "$as_me:3760: WARNING: expected a value for config-suffix option" >&5
+ echo "$as_me: WARNING: expected a value for config-suffix option" >&2;}
+ 		;;
+ 	(*)	cf_config_suffix="$withval"
+@@ -3763,7 +3767,7 @@
+ 
+ # If we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:3766: checking if you want to use pkg-config" >&5
++echo "$as_me:3770: 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.
+@@ -3773,7 +3777,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:3776: result: $cf_pkg_config" >&5
++echo "$as_me:3780: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case $cf_pkg_config in
+@@ -3785,7 +3789,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-echo "$as_me:3788: checking for $ac_word" >&5
++echo "$as_me:3792: 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
+@@ -3802,7 +3806,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:3805: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3809: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3813,10 +3817,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:3816: result: $PKG_CONFIG" >&5
++  echo "$as_me:3820: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3819: result: no" >&5
++  echo "$as_me:3823: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3825,7 +3829,7 @@
+   ac_pt_PKG_CONFIG=$PKG_CONFIG
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:3828: checking for $ac_word" >&5
++echo "$as_me:3832: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3842,7 +3846,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:3845: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3849: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3854,10 +3858,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:3857: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:3861: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3860: result: no" >&5
++  echo "$as_me:3864: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3900,24 +3904,24 @@
+ 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:3903: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:3907: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ elif test "x$cf_pkg_config" != xno ; then
+-	{ echo "$as_me:3910: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:3914: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+ case $PKG_CONFIG in
+ (no|none|yes)
+-	echo "$as_me:3916: checking for pkg-config library directory" >&5
++	echo "$as_me:3920: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:3920: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:3924: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -3972,18 +3976,18 @@
+ 
+ 	test -n "$verbose" && echo "	list..." 1>&6
+ 
+-echo "${as_me:-configure}:3975: testing list... ..." 1>&5
++echo "${as_me:-configure}:3979: testing list... ..." 1>&5
+ 
+ 	for cf_config in $cf_search_path
+ 	do
+ 		test -n "$verbose" && echo "	checking $cf_config/pkgconfig" 1>&6
+ 
+-echo "${as_me:-configure}:3981: testing checking $cf_config/pkgconfig ..." 1>&5
++echo "${as_me:-configure}:3985: testing checking $cf_config/pkgconfig ..." 1>&5
+ 
+ 		if test -d $cf_config/pkgconfig
+ 		then
+ 			PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
+-			echo "$as_me:3986: checking done" >&5
++			echo "$as_me:3990: checking done" >&5
+ echo $ECHO_N "checking done... $ECHO_C" >&6
+ 			break
+ 		fi
+@@ -3994,16 +3998,16 @@
+ esac
+ 
+ if test "x$PKG_CONFIG_LIBDIR" != xno ; then
+-	echo "$as_me:3997: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4001: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4003: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4007: checking if we should install .pc files for $PKG_CONFIG" >&5
+ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
+ else
+-	echo "$as_me:4006: checking if we should install .pc files" >&5
++	echo "$as_me:4010: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4014,7 +4018,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4017: result: $enable_pc_files" >&5
++echo "$as_me:4021: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4022,7 +4026,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xyes)
+-		{ echo "$as_me:4025: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4029: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4052,7 +4056,7 @@
+ 	PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4055: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
++	{ { echo "$as_me:4059: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4066,7 +4070,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4069: checking for suffix to add to pc-files" >&5
++	echo "$as_me:4073: checking for suffix to add to pc-files" >&5
+ echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4081,13 +4085,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4084: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4088: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4090: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4094: 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.
+@@ -4097,11 +4101,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4100: result: $enable_mixedcase" >&5
++echo "$as_me:4104: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4104: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4108: 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
+@@ -4128,7 +4132,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4131: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4135: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4147,7 +4151,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4150: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4154: 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
+@@ -4167,11 +4171,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4170: result: yes" >&5
++  echo "$as_me:4174: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4174: result: no" >&5
++  echo "$as_me:4178: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -4180,7 +4184,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:4183: checking for $ac_word" >&5
++echo "$as_me:4187: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CTAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4195,7 +4199,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4198: found $ac_dir/$ac_word" >&5
++echo "$as_me:4202: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4203,10 +4207,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4206: result: $CTAGS" >&5
++  echo "$as_me:4210: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4209: result: no" >&5
++  echo "$as_me:4213: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4217,7 +4221,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:4220: checking for $ac_word" >&5
++echo "$as_me:4224: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ETAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4232,7 +4236,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4235: found $ac_dir/$ac_word" >&5
++echo "$as_me:4239: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4240,10 +4244,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4243: result: $ETAGS" >&5
++  echo "$as_me:4247: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4246: result: no" >&5
++  echo "$as_me:4250: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4252,7 +4256,7 @@
+ 
+ # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
+ set dummy ${CTAGS:-ctags}; ac_word=$2
+-echo "$as_me:4255: checking for $ac_word" >&5
++echo "$as_me:4259: 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
+@@ -4267,7 +4271,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:4270: found $ac_dir/$ac_word" >&5
++echo "$as_me:4274: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4276,17 +4280,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4279: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4283: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4282: result: no" >&5
++  echo "$as_me:4286: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ if test "$cf_cv_mixedcase" = yes ; then
+ 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
+ set dummy ${ETAGS:-etags}; ac_word=$2
+-echo "$as_me:4289: checking for $ac_word" >&5
++echo "$as_me:4293: 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
+@@ -4301,7 +4305,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:4304: found $ac_dir/$ac_word" >&5
++echo "$as_me:4308: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4310,10 +4314,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4313: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4317: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4316: result: no" >&5
++  echo "$as_me:4320: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4333,7 +4337,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4336: checking for makeflags variable" >&5
++echo "$as_me:4340: 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
+@@ -4363,7 +4367,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4366: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4370: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -4371,13 +4375,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4374: result: $cf_cv_makeflags" >&5
++echo "$as_me:4378: 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:4380: checking for $ac_word" >&5
++echo "$as_me:4384: 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
+@@ -4392,7 +4396,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:4395: found $ac_dir/$ac_word" >&5
++echo "$as_me:4399: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4400,10 +4404,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4403: result: $RANLIB" >&5
++  echo "$as_me:4407: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4406: result: no" >&5
++  echo "$as_me:4410: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4412,7 +4416,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:4415: checking for $ac_word" >&5
++echo "$as_me:4419: 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
+@@ -4427,7 +4431,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:4430: found $ac_dir/$ac_word" >&5
++echo "$as_me:4434: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4436,10 +4440,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4439: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4443: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4442: result: no" >&5
++  echo "$as_me:4446: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4451,7 +4455,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:4454: checking for $ac_word" >&5
++echo "$as_me:4458: 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
+@@ -4466,7 +4470,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:4469: found $ac_dir/$ac_word" >&5
++echo "$as_me:4473: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4474,10 +4478,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4477: result: $LD" >&5
++  echo "$as_me:4481: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4480: result: no" >&5
++  echo "$as_me:4484: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4486,7 +4490,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:4489: checking for $ac_word" >&5
++echo "$as_me:4493: 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
+@@ -4501,7 +4505,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:4504: found $ac_dir/$ac_word" >&5
++echo "$as_me:4508: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4510,10 +4514,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4513: result: $ac_ct_LD" >&5
++  echo "$as_me:4517: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4516: result: no" >&5
++  echo "$as_me:4520: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4525,7 +4529,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:4528: checking for $ac_word" >&5
++echo "$as_me:4532: 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
+@@ -4540,7 +4544,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:4543: found $ac_dir/$ac_word" >&5
++echo "$as_me:4547: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4548,10 +4552,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4551: result: $AR" >&5
++  echo "$as_me:4555: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4554: result: no" >&5
++  echo "$as_me:4558: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4560,7 +4564,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:4563: checking for $ac_word" >&5
++echo "$as_me:4567: 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
+@@ -4575,7 +4579,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:4578: found $ac_dir/$ac_word" >&5
++echo "$as_me:4582: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4584,10 +4588,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4587: result: $ac_ct_AR" >&5
++  echo "$as_me:4591: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4590: result: no" >&5
++  echo "$as_me:4594: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4599,7 +4603,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}nm; ac_word=$2
+-echo "$as_me:4602: checking for $ac_word" >&5
++echo "$as_me:4606: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4614,7 +4618,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NM="${ac_tool_prefix}nm"
+-echo "$as_me:4617: found $ac_dir/$ac_word" >&5
++echo "$as_me:4621: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4622,10 +4626,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:4625: result: $NM" >&5
++  echo "$as_me:4629: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:4628: result: no" >&5
++  echo "$as_me:4632: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4634,7 +4638,7 @@
+   ac_ct_NM=$NM
+   # Extract the first word of "nm", so it can be a program name with args.
+ set dummy nm; ac_word=$2
+-echo "$as_me:4637: checking for $ac_word" >&5
++echo "$as_me:4641: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4649,7 +4653,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NM="nm"
+-echo "$as_me:4652: found $ac_dir/$ac_word" >&5
++echo "$as_me:4656: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4658,10 +4662,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:4661: result: $ac_ct_NM" >&5
++  echo "$as_me:4665: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:4664: result: no" >&5
++  echo "$as_me:4668: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4673,7 +4677,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:4676: checking for $ac_word" >&5
++echo "$as_me:4680: 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
+@@ -4688,7 +4692,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:4691: found $ac_dir/$ac_word" >&5
++echo "$as_me:4695: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4696,10 +4700,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4699: result: $AR" >&5
++  echo "$as_me:4703: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4702: result: no" >&5
++  echo "$as_me:4706: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4708,7 +4712,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:4711: checking for $ac_word" >&5
++echo "$as_me:4715: 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
+@@ -4723,7 +4727,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:4726: found $ac_dir/$ac_word" >&5
++echo "$as_me:4730: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4732,10 +4736,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4735: result: $ac_ct_AR" >&5
++  echo "$as_me:4739: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4738: result: no" >&5
++  echo "$as_me:4742: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4744,7 +4748,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4747: checking for options to update archives" >&5
++echo "$as_me:4751: 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
+@@ -4767,13 +4771,13 @@
+ 		rm -f conftest.a
+ 
+ 		cat >conftest.$ac_ext <&5
++		if { (eval echo "$as_me:4777: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4776: \$? = $ac_status" >&5
++  echo "$as_me:4780: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
+ 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
+@@ -4784,7 +4788,7 @@
+ 		else
+ 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4787: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4791: testing cannot compile test-program ..." 1>&5
+ 
+ 			break
+ 		fi
+@@ -4792,7 +4796,7 @@
+ 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+ 
+ fi
+-echo "$as_me:4795: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4799: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4803,7 +4807,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:4806: checking if you have specified an install-prefix" >&5
++echo "$as_me:4810: 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.
+@@ -4816,7 +4820,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4819: result: $DESTDIR" >&5
++echo "$as_me:4823: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -4844,7 +4848,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:4847: checking for $ac_word" >&5
++echo "$as_me:4851: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_BUILD_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4859,7 +4863,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:4862: found $ac_dir/$ac_word" >&5
++echo "$as_me:4866: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4867,10 +4871,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4870: result: $BUILD_CC" >&5
++  echo "$as_me:4874: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4873: result: no" >&5
++  echo "$as_me:4877: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4879,12 +4883,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:4882: checking for native build C compiler" >&5
++	echo "$as_me:4886: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4884: result: $BUILD_CC" >&5
++	echo "$as_me:4888: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4887: checking for native build C preprocessor" >&5
++	echo "$as_me:4891: 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.
+@@ -4894,10 +4898,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4897: result: $BUILD_CPP" >&5
++	echo "$as_me:4901: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4900: checking for native build C flags" >&5
++	echo "$as_me:4904: 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.
+@@ -4905,10 +4909,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4908: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4912: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4911: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4915: 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.
+@@ -4916,10 +4920,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4919: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4923: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4922: checking for native build linker-flags" >&5
++	echo "$as_me:4926: 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.
+@@ -4927,10 +4931,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4930: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4934: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4933: checking for native build linker-libraries" >&5
++	echo "$as_me:4937: 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.
+@@ -4938,7 +4942,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4941: result: $BUILD_LIBS" >&5
++	echo "$as_me:4945: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4948,7 +4952,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
+-		{ { echo "$as_me:4951: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4955: 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;}
+@@ -4973,7 +4977,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4976: checking if libtool -version-number should be used" >&5
++echo "$as_me:4980: checking if libtool -version-number should be used" >&5
+ echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
+ 
+ # Check whether --enable-libtool-version or --disable-libtool-version was given.
+@@ -4990,7 +4994,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:4993: result: $cf_libtool_version" >&5
++echo "$as_me:4997: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -4999,25 +5003,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5002: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5006: WARNING: VERSION was not set" >&5
+ echo "$as_me: WARNING: VERSION was not set" >&2;}
+ 		;;
+ 	(x*.*.*)
+ 		ABI_VERSION="$VERSION"
+ 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:5009: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5013: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(x*:*:*)
+ 		ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
+ 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:5016: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5020: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5020: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5024: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5039,7 +5043,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5042: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5046: 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.
+@@ -5049,7 +5053,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5052: result: $with_libtool" >&5
++echo "$as_me:5056: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5080,7 +5084,7 @@
+ 	with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5083: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5087: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5093,7 +5097,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:5096: checking for $ac_word" >&5
++echo "$as_me:5100: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5108,7 +5112,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+-echo "$as_me:5111: found $ac_dir/$ac_word" >&5
++echo "$as_me:5115: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5116,10 +5120,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5119: result: $LIBTOOL" >&5
++  echo "$as_me:5123: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5122: result: no" >&5
++  echo "$as_me:5126: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5132,7 +5136,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:5135: checking for $ac_word" >&5
++echo "$as_me:5139: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5147,7 +5151,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+-echo "$as_me:5150: found $ac_dir/$ac_word" >&5
++echo "$as_me:5154: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5155,10 +5159,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5158: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5162: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5161: result: no" >&5
++  echo "$as_me:5165: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5189,7 +5193,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:5192: checking for $ac_word" >&5
++echo "$as_me:5196: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5204,7 +5208,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+-echo "$as_me:5207: found $ac_dir/$ac_word" >&5
++echo "$as_me:5211: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5212,10 +5216,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5215: result: $LIBTOOL" >&5
++  echo "$as_me:5219: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5218: result: no" >&5
++  echo "$as_me:5222: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5228,7 +5232,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:5231: checking for $ac_word" >&5
++echo "$as_me:5235: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5243,7 +5247,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+-echo "$as_me:5246: found $ac_dir/$ac_word" >&5
++echo "$as_me:5250: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5251,10 +5255,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5254: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5258: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5257: result: no" >&5
++  echo "$as_me:5261: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5276,7 +5280,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:5279: error: Cannot find libtool" >&5
++		{ { echo "$as_me:5283: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -5292,7 +5296,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:5295: checking version of $LIBTOOL" >&5
++	echo "$as_me:5299: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -5303,15 +5307,15 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:5306: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:5310: 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:5309: error: This is not GNU libtool" >&5
++		{ { echo "$as_me:5313: error: This is not GNU libtool" >&5
+ echo "$as_me: error: This is not GNU libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ else
+-	{ { echo "$as_me:5314: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:5318: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5347,7 +5351,7 @@
+ 
+ else
+ 
+-echo "$as_me:5350: checking if you want to build shared libraries" >&5
++echo "$as_me:5354: 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.
+@@ -5357,11 +5361,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:5360: result: $with_shared" >&5
++echo "$as_me:5364: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:5364: checking if you want to build static libraries" >&5
++echo "$as_me:5368: 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.
+@@ -5371,11 +5375,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:5374: result: $with_normal" >&5
++echo "$as_me:5378: result: $with_normal" >&5
+ echo "${ECHO_T}$with_normal" >&6
+ test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
+ 
+-echo "$as_me:5378: checking if you want to build debug libraries" >&5
++echo "$as_me:5382: 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.
+@@ -5385,11 +5389,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:5388: result: $with_debug" >&5
++echo "$as_me:5392: result: $with_debug" >&5
+ echo "${ECHO_T}$with_debug" >&6
+ test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
+ 
+-echo "$as_me:5392: checking if you want to build profiling libraries" >&5
++echo "$as_me:5396: 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.
+@@ -5399,7 +5403,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:5402: result: $with_profile" >&5
++echo "$as_me:5406: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -5407,7 +5411,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:5410: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:5414: checking if you want to build C++ shared libraries" >&5
+ echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-shared or --without-cxx-shared was given.
+@@ -5417,26 +5421,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:5420: result: $with_shared_cxx" >&5
++echo "$as_me:5424: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5427: checking for specified models" >&5
++echo "$as_me:5431: 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:5431: result: $cf_list_models" >&5
++echo "$as_me:5435: 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:5436: checking for default model" >&5
++echo "$as_me:5440: 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:5439: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:5443: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -5450,7 +5454,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:5453: checking if you want to have a library-prefix" >&5
++echo "$as_me:5457: checking if you want to have a library-prefix" >&5
+ echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-lib-prefix or --without-lib-prefix was given.
+@@ -5460,7 +5464,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:5463: result: $with_lib_prefix" >&5
++echo "$as_me:5467: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test $with_lib_prefix = auto
+@@ -5488,19 +5492,19 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:5491: checking for PATH separator" >&5
++	echo "$as_me:5495: checking for PATH separator" >&5
+ echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
+ 	case $cf_cv_system_name in
+ 	(os2*)	PATH_SEPARATOR=';'  ;;
+ 	(*)	${PATH_SEPARATOR:=':'}  ;;
+ 	esac
+ 
+-	echo "$as_me:5498: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:5502: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5503: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:5507: 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.
+@@ -5510,10 +5514,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:5513: result: $with_termlib" >&5
++echo "$as_me:5517: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:5516: checking if you want to build a separate tic library" >&5
++echo "$as_me:5520: 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.
+@@ -5523,7 +5527,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:5526: result: $with_ticlib" >&5
++echo "$as_me:5530: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -5536,7 +5540,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:5539: checking for default loader flags" >&5
++echo "$as_me:5543: 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=''   ;;
+@@ -5545,13 +5549,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:5548: result: $LD_MODEL" >&5
++echo "$as_me:5552: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ case $DFT_LWR_MODEL in
+ (shared)
+ 
+-echo "$as_me:5554: checking if rpath option should be used" >&5
++echo "$as_me:5558: 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.
+@@ -5561,10 +5565,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:5564: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5568: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:5567: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5571: 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.
+@@ -5574,7 +5578,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:5577: result: $cf_cv_do_relink" >&5
++echo "$as_me:5581: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -5585,7 +5589,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:5588: checking for an rpath option" >&5
++	echo "$as_me:5592: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case $cf_cv_system_name in
+ 	(irix*)
+@@ -5616,12 +5620,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:5619: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:5623: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:5624: checking if we need a space after rpath option" >&5
++		echo "$as_me:5628: 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"
+ 
+@@ -5642,7 +5646,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5645 "configure"
++#line 5649 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5654,16 +5658,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5657: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5661: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5660: \$? = $ac_status" >&5
++  echo "$as_me:5664: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5663: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5667: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5666: \$? = $ac_status" >&5
++  echo "$as_me:5670: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_space=no
+ else
+@@ -5673,7 +5677,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:5676: result: $cf_rpath_space" >&5
++		echo "$as_me:5680: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -5695,7 +5699,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:5698: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:5702: 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.
+@@ -5710,9 +5714,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:5713: result: $withval" >&5
++		echo "$as_me:5717: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:5715: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:5719: error: option value must be one of: rel, abi, or auto" >&5
+ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+@@ -5721,7 +5725,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:5724: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:5728: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -5744,14 +5748,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:5747: checking which $CC option to use" >&5
++		echo "$as_me:5751: 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 5754 "configure"
++#line 5758 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5763,16 +5767,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5766: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5769: \$? = $ac_status" >&5
++  echo "$as_me:5773: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5772: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5775: \$? = $ac_status" >&5
++  echo "$as_me:5779: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -5781,7 +5785,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		done
+-		echo "$as_me:5784: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:5788: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -5852,7 +5856,7 @@
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ 		cf_cv_shlib_version_infix=yes
+-		echo "$as_me:5855: checking if ld -search_paths_first works" >&5
++		echo "$as_me:5859: 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
+@@ -5861,7 +5865,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 5864 "configure"
++#line 5868 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5873,16 +5877,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5876: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5879: \$? = $ac_status" >&5
++  echo "$as_me:5883: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5882: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5885: \$? = $ac_status" >&5
++  echo "$as_me:5889: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -5893,7 +5897,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:5896: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:5900: 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"
+@@ -6149,7 +6153,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 6152 "configure"
++#line 6156 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6161,16 +6165,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6164: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6168: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6167: \$? = $ac_status" >&5
++  echo "$as_me:6171: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6170: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6173: \$? = $ac_status" >&5
++  echo "$as_me:6177: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -6207,7 +6211,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:6210: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:6214: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -6217,7 +6221,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -6229,18 +6233,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:6232: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:6236: checking if CFLAGS option -$cf_opt works" >&5
+ echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
+-			if { (eval echo "$as_me:6234: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:6238: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6237: \$? = $ac_status" >&5
++  echo "$as_me:6241: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-				echo "$as_me:6239: result: yes" >&5
++				echo "$as_me:6243: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:6243: result: no" >&5
++				echo "$as_me:6247: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -6255,17 +6259,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:6258: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:6262: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6262: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6266: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models; do
+ 	case $model in
+ 	(libtool)
+ 
+-echo "$as_me:6268: checking for additional libtool options" >&5
++echo "$as_me:6272: checking for additional libtool options" >&5
+ echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
+ 
+ # Check whether --with-libtool-opts or --without-libtool-opts was given.
+@@ -6275,7 +6279,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:6278: result: $with_libtool_opts" >&5
++echo "$as_me:6282: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -6286,7 +6290,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6289: checking if exported-symbols file should be used" >&5
++echo "$as_me:6293: checking if exported-symbols file should be used" >&5
+ echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-export-syms or --without-export-syms was given.
+@@ -6301,7 +6305,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:6304: result: $with_export_syms" >&5
++echo "$as_me:6308: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -6312,15 +6316,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:6315: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:6319: error: Shared libraries are not supported in this version" >&5
+ echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+ 		# workaround for inept transition to PIE vs PIC...
+-		echo "$as_me:6320: checking if current CFLAGS link properly" >&5
++		echo "$as_me:6324: checking if current CFLAGS link properly" >&5
+ echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6323 "configure"
++#line 6327 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6332,16 +6336,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6335: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6338: \$? = $ac_status" >&5
++  echo "$as_me:6342: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6341: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6344: \$? = $ac_status" >&5
++  echo "$as_me:6348: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -6350,18 +6354,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:6353: result: $cf_cflags_work" >&5
++		echo "$as_me:6357: result: $cf_cflags_work" >&5
+ echo "${ECHO_T}$cf_cflags_work" >&6
+ 		if test "$cf_cflags_work" = no
+ 		then
+ 			test -n "$verbose" && echo "	try to work around by appending shared-options" 1>&6
+ 
+-echo "${as_me:-configure}:6359: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:6363: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:6364: checking if versioned-symbols file should be used" >&5
++echo "$as_me:6368: checking if versioned-symbols file should be used" >&5
+ echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-versioned-syms or --without-versioned-syms was given.
+@@ -6379,18 +6383,18 @@
+ (xno)
+ 	;;
+ (x/*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6382: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6386: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ (*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6387: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6391: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+    { (exit 1); exit 1; }; }
+ 	with_versioned_syms=`pwd`/"$with_versioned_syms"
+ 	;;
+ esac
+-echo "$as_me:6393: result: $with_versioned_syms" >&5
++echo "$as_me:6397: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -6406,7 +6410,7 @@
+ 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
+ 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6409: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6413: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -6414,11 +6418,11 @@
+ 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
+ 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6417: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6421: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:6421: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:6425: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -6430,7 +6434,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:6433: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:6437: checking if wildcards can be used to selectively omit symbols" >&5
+ echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
+ 		WILDCARD_SYMS=no
+ 
+@@ -6467,7 +6471,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5 |fgrep _ismissing | egrep '[ 	][DT][ 	]'`
+ 			test -n "$cf_missing" && WILDCARD_SYMS=yes
+ 		fi
+-		echo "$as_me:6501: result: $WILDCARD_SYMS" >&5
++		echo "$as_me:6505: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -6511,7 +6515,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:6514: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:6518: 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.
+@@ -6521,27 +6525,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:6524: result: $with_gpm" >&5
++echo "$as_me:6528: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:6528: checking for gpm.h" >&5
++	echo "$as_me:6532: 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 6534 "configure"
++#line 6538 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:6538: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6542: \"$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:6544: \$? = $ac_status" >&5
++  echo "$as_me:6548: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6560,7 +6564,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:6563: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:6567: 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
+ 
+@@ -6571,7 +6575,7 @@
+ 		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}:6574: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:6578: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -6579,7 +6583,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:6582: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:6586: 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
+@@ -6587,7 +6591,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6590 "configure"
++#line 6594 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6606,16 +6610,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6609: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6613: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6612: \$? = $ac_status" >&5
++  echo "$as_me:6616: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6615: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6619: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6618: \$? = $ac_status" >&5
++  echo "$as_me:6622: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6626,18 +6630,18 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6629: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6633: 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
+   with_gpm=yes
+ else
+ 
+ 				if test "$with_gpm" = maybe; then
+-					{ echo "$as_me:6636: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:6640: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:6640: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:6644: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -6648,7 +6652,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:6651: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:6655: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -6657,7 +6661,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:6660: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:6664: 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.
+@@ -6667,18 +6671,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:6670: result: $with_dlsym" >&5
++	echo "$as_me:6674: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:6675: checking for dlsym" >&5
++echo "$as_me:6679: 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 6681 "configure"
++#line 6685 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6709,16 +6713,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6716: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6715: \$? = $ac_status" >&5
++  echo "$as_me:6719: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6718: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6722: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6721: \$? = $ac_status" >&5
++  echo "$as_me:6725: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -6728,14 +6732,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6731: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:6735: 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:6738: checking for dlsym in -ldl" >&5
++echo "$as_me:6742: 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
+@@ -6743,7 +6747,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6746 "configure"
++#line 6750 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6762,16 +6766,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6765: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6769: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6768: \$? = $ac_status" >&5
++  echo "$as_me:6772: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6771: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6775: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6774: \$? = $ac_status" >&5
++  echo "$as_me:6778: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -6782,7 +6786,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6785: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:6789: 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
+ 
+@@ -6811,10 +6815,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:6814: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:6818: 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 6817 "configure"
++#line 6821 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6832,16 +6836,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6835: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6839: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6838: \$? = $ac_status" >&5
++  echo "$as_me:6842: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6845: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6844: \$? = $ac_status" >&5
++  echo "$as_me:6848: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -6852,15 +6856,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ 
+-		{ { echo "$as_me:6855: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:6859: 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:6860: result: ok" >&5
++	echo "$as_me:6864: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:6863: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:6867: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6868,12 +6872,12 @@
+ 		if test "x$with_gpm" != xyes ; then
+ 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
+ 
+-echo "${as_me:-configure}:6871: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:6875: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:6876: checking for soname of gpm library" >&5
++echo "$as_me:6880: 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
+@@ -6907,15 +6911,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:6910: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:6914: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6913: \$? = $ac_status" >&5
++  echo "$as_me:6917: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:6915: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:6919: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6918: \$? = $ac_status" >&5
++  echo "$as_me:6922: \$? = $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
+@@ -6926,7 +6930,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:6929: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:6933: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -6994,7 +6998,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:6997: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:7001: 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
+@@ -7002,7 +7006,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7005 "configure"
++#line 7009 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7021,16 +7025,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7028: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7027: \$? = $ac_status" >&5
++  echo "$as_me:7031: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7033: \$? = $ac_status" >&5
++  echo "$as_me:7037: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -7041,11 +7045,11 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7044: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:7048: 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:7048: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:7052: 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
+@@ -7069,15 +7073,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:7072: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7076: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7075: \$? = $ac_status" >&5
++  echo "$as_me:7079: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:7077: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7081: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7080: \$? = $ac_status" >&5
++  echo "$as_me:7084: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'`
+ 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
+@@ -7089,11 +7093,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:7092: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:7096: 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:7096: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:7100: 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
+ 
+@@ -7101,7 +7105,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7104: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:7108: checking if you want to use PCRE2 for regular-expressions" >&5
+ echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
+ 
+ # Check whether --with-pcre2 or --without-pcre2 was given.
+@@ -7110,7 +7114,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:7113: result: $with_pcre2" >&5
++echo "$as_me:7117: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -7118,17 +7122,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre2; then
+ 	test -n "$verbose" && echo "	found package libpcre2" 1>&6
+ 
+-echo "${as_me:-configure}:7121: testing found package libpcre2 ..." 1>&5
++echo "${as_me:-configure}:7125: testing found package libpcre2 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre2 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre2 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package libpcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:7127: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:7131: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package libpcre2 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:7131: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:7135: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7252,17 +7256,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then
+ 	test -n "$verbose" && echo "	found package libpcre" 1>&6
+ 
+-echo "${as_me:-configure}:7255: testing found package libpcre ..." 1>&5
++echo "${as_me:-configure}:7259: testing found package libpcre ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:7261: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:7265: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package libpcre LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:7265: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:7269: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7383,7 +7387,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-			{ { echo "$as_me:7386: error: Cannot find PCRE2 library" >&5
++			{ { echo "$as_me:7390: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7399,7 +7403,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:7402: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:7406: checking for regcomp in -lpcre2-posix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7407,7 +7411,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7410 "configure"
++#line 7414 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7426,16 +7430,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7429: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7433: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7432: \$? = $ac_status" >&5
++  echo "$as_me:7436: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7435: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7438: \$? = $ac_status" >&5
++  echo "$as_me:7442: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -7446,7 +7450,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7449: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:7453: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
+ if test $ac_cv_lib_pcre2_posix_regcomp = yes; then
+ 
+@@ -7467,7 +7471,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:7470: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:7474: checking for regcomp in -lpcreposix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7475,7 +7479,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7478 "configure"
++#line 7482 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7494,16 +7498,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7497: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7501: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7500: \$? = $ac_status" >&5
++  echo "$as_me:7504: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7507: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7506: \$? = $ac_status" >&5
++  echo "$as_me:7510: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -7514,7 +7518,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7517: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:7521: result: $ac_cv_lib_pcreposix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
+ if test $ac_cv_lib_pcreposix_regcomp = yes; then
+ 
+@@ -7535,7 +7539,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:7538: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:7542: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7550,23 +7554,23 @@
+ for ac_header in pcre2posix.h pcreposix.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7553: checking for $ac_header" >&5
++echo "$as_me:7557: 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 7559 "configure"
++#line 7563 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7563: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:7567: \"$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:7569: \$? = $ac_status" >&5
++  echo "$as_me:7573: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7585,7 +7589,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:7588: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:7592: 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 </dev/null ; then
+-echo "$as_me:7602: checking if you want to use sysmouse" >&5
++echo "$as_me:7606: 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.
+@@ -7611,7 +7615,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7614 "configure"
++#line 7618 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7634,16 +7638,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7637: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7641: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7640: \$? = $ac_status" >&5
++  echo "$as_me:7644: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7646: \$? = $ac_status" >&5
++  echo "$as_me:7650: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -7653,7 +7657,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	fi
+-echo "$as_me:7656: result: $cf_with_sysmouse" >&5
++echo "$as_me:7660: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -7663,7 +7667,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:7666: checking if you want to disable library suffixes" >&5
++echo "$as_me:7670: checking if you want to disable library suffixes" >&5
+ echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
+ 
+ # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
+@@ -7680,13 +7684,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:7683: result: $disable_lib_suffixes" >&5
++echo "$as_me:7687: result: $disable_lib_suffixes" >&5
+ echo "${ECHO_T}$disable_lib_suffixes" >&6
+ 
+ ### If we're building with rpath, try to link non-standard libs that way too.
+ if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
+ 
+-echo "$as_me:7689: checking if rpath-hack should be disabled" >&5
++echo "$as_me:7693: checking if rpath-hack should be disabled" >&5
+ echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+@@ -7703,21 +7707,21 @@
+ 	cf_disable_rpath_hack=no
+ 
+ fi;
+-echo "$as_me:7706: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:7710: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ if test "$cf_disable_rpath_hack" = no ; then
+ 
+-echo "$as_me:7710: checking for updated LDFLAGS" >&5
++echo "$as_me:7714: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LD_RPATH_OPT" ; then
+-	echo "$as_me:7713: result: maybe" >&5
++	echo "$as_me:7717: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+ 
+ 	for ac_prog in ldd
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:7720: checking for $ac_word" >&5
++echo "$as_me:7724: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7732,7 +7736,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_cf_ldd_prog="$ac_prog"
+-echo "$as_me:7735: found $ac_dir/$ac_word" >&5
++echo "$as_me:7739: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7740,10 +7744,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:7743: result: $cf_ldd_prog" >&5
++  echo "$as_me:7747: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:7746: result: no" >&5
++  echo "$as_me:7750: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7757,7 +7761,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7760 "configure"
++#line 7764 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7769,16 +7773,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7772: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7776: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7775: \$? = $ac_status" >&5
++  echo "$as_me:7779: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7778: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7782: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7781: \$? = $ac_status" >&5
++  echo "$as_me:7785: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -7806,7 +7810,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:7809: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:7813: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -7818,11 +7822,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7821: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7825: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7825: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7829: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -7859,7 +7863,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:7862: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:7866: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -7872,11 +7876,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7875: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7879: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:7879: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:7883: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -7913,7 +7917,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:7916: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:7920: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -7926,14 +7930,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:7929: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:7933: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:7933: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:7937: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:7936: result: no" >&5
++	echo "$as_me:7940: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7944,7 +7948,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:7947: checking if you wish to append extra suffix to header/library paths" >&5
++echo "$as_me:7951: checking if you wish to append extra suffix to header/library paths" >&5
+ echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -7963,11 +7967,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:7966: result: $EXTRA_SUFFIX" >&5
++echo "$as_me:7970: result: $EXTRA_SUFFIX" >&5
+ echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:7970: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:7974: 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.
+@@ -7977,10 +7981,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:7980: result: $with_overwrite" >&5
++echo "$as_me:7984: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:7983: checking if external terminfo-database is used" >&5
++echo "$as_me:7987: 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.
+@@ -7990,7 +7994,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:7993: result: $use_database" >&5
++echo "$as_me:7997: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case $host_os in
+@@ -8006,7 +8010,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:8009: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:8013: checking which terminfo source-file will be installed" >&5
+ echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
+ 
+ # Check whether --with-database or --without-database was given.
+@@ -8014,10 +8018,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:8017: result: $TERMINFO_SRC" >&5
++	echo "$as_me:8021: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:8020: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:8024: 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.
+@@ -8027,13 +8031,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:8030: result: $with_hashed_db" >&5
++	echo "$as_me:8034: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:8036: checking for list of fallback descriptions" >&5
++echo "$as_me:8040: 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.
+@@ -8043,7 +8047,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:8046: result: $with_fallback" >&5
++echo "$as_me:8050: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ 
+ case ".$with_fallback" in
+@@ -8051,7 +8055,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:8054: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:8058: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -8073,10 +8077,10 @@
+ # Check whether --with-tic-path or --without-tic-path was given.
+ if test "${with_tic_path+set}" = set; then
+   withval="$with_tic_path"
+-  echo "$as_me:8076: checking for tic program for fallbacks" >&5
++  echo "$as_me:8080: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:8079: result: $TIC" >&5
++		echo "$as_me:8083: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8104,7 +8108,7 @@
+ 	TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8107: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:8111: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8117,7 +8121,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:8120: checking for $ac_word" >&5
++echo "$as_me:8124: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_TIC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8134,7 +8138,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_TIC="$ac_dir/$ac_word"
+-   echo "$as_me:8137: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8141: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8145,10 +8149,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:8148: result: $TIC" >&5
++  echo "$as_me:8152: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8151: result: no" >&5
++  echo "$as_me:8155: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8207,7 +8211,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8210: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8214: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:8229: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8231,10 +8235,10 @@
+ # Check whether --with-infocmp-path or --without-infocmp-path was given.
+ if test "${with_infocmp_path+set}" = set; then
+   withval="$with_infocmp_path"
+-  echo "$as_me:8234: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:8238: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:8237: result: $INFOCMP" >&5
++		echo "$as_me:8241: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8262,7 +8266,7 @@
+ 	INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8265: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:8269: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8275,7 +8279,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:8278: checking for $ac_word" >&5
++echo "$as_me:8282: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_INFOCMP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8292,7 +8296,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
+-   echo "$as_me:8295: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8299: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8303,10 +8307,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8306: result: $INFOCMP" >&5
++  echo "$as_me:8310: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8309: result: no" >&5
++  echo "$as_me:8313: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8365,7 +8369,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8368: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8372: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:8387: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8391,7 +8395,7 @@
+ 	: ${INFOCMP:=infocmp}
+ fi
+ 
+-echo "$as_me:8394: checking if you want modern xterm or antique" >&5
++echo "$as_me:8398: 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.
+@@ -8405,11 +8409,11 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:8408: result: $with_xterm_new" >&5
++echo "$as_me:8412: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+-echo "$as_me:8412: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:8416: checking if xterm backspace sends BS or DEL" >&5
+ echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
+ 
+ # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
+@@ -8430,7 +8434,7 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:8433: result: $with_xterm_kbs" >&5
++echo "$as_me:8437: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+@@ -8440,7 +8444,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:8443: checking for list of terminfo directories" >&5
++echo "$as_me:8447: 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.
+@@ -8480,7 +8484,7 @@
+ 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8483: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:8487: 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; }; }
+ 	;;
+@@ -8503,7 +8507,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:8506: result: $TERMINFO_DIRS" >&5
++echo "$as_me:8510: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:8519: WARNING: ignoring non-directory/file TERMINFO value" >&5
+ echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
+ 	unset TERMINFO
+ 	;;
+ esac
+ 
+-echo "$as_me:8521: checking for default terminfo directory" >&5
++echo "$as_me:8525: 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.
+@@ -8554,7 +8558,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8557: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:8561: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8563,7 +8567,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:8566: result: $TERMINFO" >&5
++echo "$as_me:8570: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:8581: 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.
+@@ -8586,7 +8590,7 @@
+   with_big_core=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8589 "configure"
++#line 8593 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8600,15 +8604,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:8603: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8607: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8606: \$? = $ac_status" >&5
++  echo "$as_me:8610: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8612: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8611: \$? = $ac_status" >&5
++  echo "$as_me:8615: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_big_core=yes
+ else
+@@ -8620,7 +8624,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi;
+-echo "$as_me:8623: result: $with_big_core" >&5
++echo "$as_me:8627: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -8630,7 +8634,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:8633: checking if big-strings option selected" >&5
++echo "$as_me:8637: 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.
+@@ -8654,14 +8658,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:8657: result: $with_big_strings" >&5
++echo "$as_me:8661: result: $with_big_strings" >&5
+ echo "${ECHO_T}$with_big_strings" >&6
+ 
+ USE_BIG_STRINGS=0
+ test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
+ 
+ ###	use option --enable-termcap to compile in the termcap fallback support
+-echo "$as_me:8664: checking if you want termcap-fallback support" >&5
++echo "$as_me:8668: 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.
+@@ -8671,14 +8675,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:8674: result: $with_termcap" >&5
++echo "$as_me:8678: result: $with_termcap" >&5
+ echo "${ECHO_T}$with_termcap" >&6
+ 
+ NCURSES_USE_TERMCAP=0
+ if test "x$with_termcap" != "xyes" ; then
+ 	if test "$use_database" = no ; then
+ 		if test -z "$with_fallback" ; then
+-			{ { echo "$as_me:8681: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:8685: 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
+@@ -8691,13 +8695,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:8694: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:8698: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+ echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 
+ 	NCURSES_USE_TERMCAP=1
+-	echo "$as_me:8700: checking for list of termcap files" >&5
++	echo "$as_me:8704: 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.
+@@ -8737,7 +8741,7 @@
+ 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8740: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:8744: 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; }; }
+ 	;;
+@@ -8760,7 +8764,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:8763: result: $TERMPATH" >&5
++	echo "$as_me:8767: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:8775: 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.
+@@ -8778,14 +8782,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:8781: result: $with_getcap" >&5
++	echo "$as_me:8785: result: $with_getcap" >&5
+ echo "${ECHO_T}$with_getcap" >&6
+ 	test "x$with_getcap" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_GETCAP 1
+ EOF
+ 
+-	echo "$as_me:8788: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:8792: 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.
+@@ -8795,7 +8799,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:8798: result: $with_getcap_cache" >&5
++	echo "$as_me:8802: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -8805,7 +8809,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:8808: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:8812: 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.
+@@ -8815,14 +8819,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:8818: result: $with_home_terminfo" >&5
++echo "$as_me:8822: result: $with_home_terminfo" >&5
+ echo "${ECHO_T}$with_home_terminfo" >&6
+ test "x$with_home_terminfo" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_HOME_TERMINFO 1
+ EOF
+ 
+-echo "$as_me:8825: checking if you want to use restricted environment when running as root" >&5
++echo "$as_me:8829: 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.
+@@ -8832,7 +8836,7 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:8835: result: $with_root_environ" >&5
++echo "$as_me:8839: result: $with_root_environ" >&5
+ echo "${ECHO_T}$with_root_environ" >&6
+ test "x$with_root_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -8847,23 +8851,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8850: checking for $ac_header" >&5
++echo "$as_me:8854: 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 8856 "configure"
++#line 8860 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8860: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8864: \"$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:8866: \$? = $ac_status" >&5
++  echo "$as_me:8870: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8882,7 +8886,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:8885: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:8889: 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 <&5
++echo "$as_me:8904: 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 8906 "configure"
++#line 8910 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8934,16 +8938,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8937: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8941: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8940: \$? = $ac_status" >&5
++  echo "$as_me:8944: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8943: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8946: \$? = $ac_status" >&5
++  echo "$as_me:8950: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8953,7 +8957,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8956: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:8960: 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 <&5
++echo "$as_me:8977: 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 8979 "configure"
++#line 8983 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9007,16 +9011,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9010: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9014: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9013: \$? = $ac_status" >&5
++  echo "$as_me:9017: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9019: \$? = $ac_status" >&5
++  echo "$as_me:9023: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9026,7 +9030,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9029: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:9033: 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 <&5
++	echo "$as_me:9044: 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
+@@ -9050,7 +9054,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9053 "configure"
++#line 9057 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9080,15 +9084,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9083: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9087: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9086: \$? = $ac_status" >&5
++  echo "$as_me:9090: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9092: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9091: \$? = $ac_status" >&5
++  echo "$as_me:9095: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -9106,7 +9110,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:9109: result: $cf_cv_link_funcs" >&5
++echo "$as_me:9113: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -9126,7 +9130,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 "x$ac_cv_func_symlink" = xyes ; then
+-	echo "$as_me:9129: checking if tic should use symbolic links" >&5
++	echo "$as_me:9133: 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.
+@@ -9136,21 +9140,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:9139: result: $with_symlinks" >&5
++	echo "$as_me:9143: 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:9146: checking if tic should use hard links" >&5
++	echo "$as_me:9150: checking if tic should use hard links" >&5
+ echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
+ 	if test "x$ac_cv_func_link" = xyes ; then
+ 		with_links=yes
+ 	else
+ 		with_links=no
+ 	fi
+-	echo "$as_me:9153: result: $with_links" >&5
++	echo "$as_me:9157: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -9166,7 +9170,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:9169: checking if you want broken-linker support code" >&5
++echo "$as_me:9173: 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.
+@@ -9176,7 +9180,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:9179: result: $with_broken_linker" >&5
++echo "$as_me:9183: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : ${BROKEN_LINKER:=0}
+@@ -9190,7 +9194,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:9193: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:9197: 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.
+@@ -9200,7 +9204,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:9203: result: $with_bsdpad" >&5
++echo "$as_me:9207: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9219,14 +9223,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:9222: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:9226: checking if the POSIX test-macros are already defined" >&5
+ echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+ if test "${cf_cv_posix_visible+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9229 "configure"
++#line 9233 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9245,16 +9249,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9248: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9252: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9251: \$? = $ac_status" >&5
++  echo "$as_me:9255: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9254: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9257: \$? = $ac_status" >&5
++  echo "$as_me:9261: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -9265,7 +9269,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9268: result: $cf_cv_posix_visible" >&5
++echo "$as_me:9272: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -9310,14 +9314,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:9313: checking if this is the GNU C library" >&5
++echo "$as_me:9317: checking if this is the GNU C library" >&5
+ echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9320 "configure"
++#line 9324 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9336,16 +9340,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9339: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9343: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9342: \$? = $ac_status" >&5
++  echo "$as_me:9346: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9348: \$? = $ac_status" >&5
++  echo "$as_me:9352: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -9356,7 +9360,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9359: result: $cf_cv_gnu_library" >&5
++echo "$as_me:9363: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -9364,7 +9368,7 @@
+ 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+ 	# was changed to help a little.  newlib incorporated the change about 4
+ 	# years later.
+-	echo "$as_me:9367: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:9371: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+ echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9376,7 +9380,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9379 "configure"
++#line 9383 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9395,16 +9399,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9398: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9402: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9401: \$? = $ac_status" >&5
++  echo "$as_me:9405: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9407: \$? = $ac_status" >&5
++  echo "$as_me:9411: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -9416,12 +9420,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:9419: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:9423: result: $cf_cv_gnu_library_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+ 
+ 	if test "x$cf_cv_gnu_library_219" = xyes; then
+ 		cf_save="$CPPFLAGS"
+-		echo "$as_me:9424: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:9428: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9526,7 +9530,7 @@
+ fi
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 9529 "configure"
++#line 9533 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -9546,16 +9550,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9549: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9553: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9552: \$? = $ac_status" >&5
++  echo "$as_me:9556: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9555: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9558: \$? = $ac_status" >&5
++  echo "$as_me:9562: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -9566,7 +9570,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9569: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:9573: result: $cf_cv_gnu_dftsrc_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+ 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+ 	else
+@@ -9575,14 +9579,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:9578: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:9582: 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 9585 "configure"
++#line 9589 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9597,16 +9601,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9600: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9604: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9603: \$? = $ac_status" >&5
++  echo "$as_me:9607: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9606: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9609: \$? = $ac_status" >&5
++  echo "$as_me:9613: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -9713,7 +9717,7 @@
+ fi
+ 
+ 			 cat >conftest.$ac_ext <<_ACEOF
+-#line 9716 "configure"
++#line 9720 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9728,16 +9732,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9731: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9735: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9734: \$? = $ac_status" >&5
++  echo "$as_me:9738: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9740: \$? = $ac_status" >&5
++  echo "$as_me:9744: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -9752,12 +9756,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9755: result: $cf_cv_gnu_source" >&5
++echo "$as_me:9759: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ 
+ 		if test "$cf_cv_gnu_source" = yes
+ 		then
+-		echo "$as_me:9760: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:9764: checking if we should also define _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_default_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9767,7 +9771,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 9770 "configure"
++#line 9774 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9782,16 +9786,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9785: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9789: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9788: \$? = $ac_status" >&5
++  echo "$as_me:9792: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9794: \$? = $ac_status" >&5
++  echo "$as_me:9798: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -9802,7 +9806,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9805: result: $cf_cv_default_source" >&5
++echo "$as_me:9809: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -9839,16 +9843,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:9842: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:9846: 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}:9848: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:9852: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9851 "configure"
++#line 9855 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9863,16 +9867,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9866: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9870: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9869: \$? = $ac_status" >&5
++  echo "$as_me:9873: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9876: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9875: \$? = $ac_status" >&5
++  echo "$as_me:9879: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -9893,7 +9897,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9896 "configure"
++#line 9900 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9908,16 +9912,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9915: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9914: \$? = $ac_status" >&5
++  echo "$as_me:9918: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9921: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9920: \$? = $ac_status" >&5
++  echo "$as_me:9924: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9928,7 +9932,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:9931: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:9935: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -9936,10 +9940,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:9939: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:9943: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 9942 "configure"
++#line 9946 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9954,16 +9958,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9957: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9961: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9960: \$? = $ac_status" >&5
++  echo "$as_me:9964: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9966: \$? = $ac_status" >&5
++  echo "$as_me:9970: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9979,7 +9983,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9982: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:9986: 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
+@@ -10119,14 +10123,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:10122: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10126: 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 10129 "configure"
++#line 10133 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10145,16 +10149,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10148: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10152: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10151: \$? = $ac_status" >&5
++  echo "$as_me:10155: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10158: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10157: \$? = $ac_status" >&5
++  echo "$as_me:10161: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10166,7 +10170,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 10169 "configure"
++#line 10173 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10185,16 +10189,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10188: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10192: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10191: \$? = $ac_status" >&5
++  echo "$as_me:10195: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10194: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10198: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10197: \$? = $ac_status" >&5
++  echo "$as_me:10201: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10209,7 +10213,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:10212: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10216: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10339,16 +10343,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10342: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10346: 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}:10348: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10352: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10351 "configure"
++#line 10355 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10363,16 +10367,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10366: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10370: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10369: \$? = $ac_status" >&5
++  echo "$as_me:10373: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10376: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10375: \$? = $ac_status" >&5
++  echo "$as_me:10379: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -10393,7 +10397,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 10396 "configure"
++#line 10400 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10408,16 +10412,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10411: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10415: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10414: \$? = $ac_status" >&5
++  echo "$as_me:10418: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10420: \$? = $ac_status" >&5
++  echo "$as_me:10424: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10428,7 +10432,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:10431: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:10435: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -10436,10 +10440,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:10439: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:10443: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 10442 "configure"
++#line 10446 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10454,16 +10458,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10457: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10461: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10460: \$? = $ac_status" >&5
++  echo "$as_me:10464: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10463: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10467: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10466: \$? = $ac_status" >&5
++  echo "$as_me:10470: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10479,7 +10483,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:10482: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:10486: 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
+@@ -10673,7 +10677,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:10676: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:10680: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -10683,7 +10687,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:10686: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:10690: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -10693,7 +10697,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:10696: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:10700: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -10703,10 +10707,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:10706: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:10710: checking if _XOPEN_SOURCE really is set" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10709 "configure"
++#line 10713 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10721,16 +10725,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10724: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10728: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10727: \$? = $ac_status" >&5
++  echo "$as_me:10731: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10734: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10733: \$? = $ac_status" >&5
++  echo "$as_me:10737: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -10739,12 +10743,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:10742: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:10746: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
+ 	if test $cf_XOPEN_SOURCE_set = yes
+ 	then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 10747 "configure"
++#line 10751 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10759,16 +10763,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10762: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10766: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10765: \$? = $ac_status" >&5
++  echo "$as_me:10769: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10772: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10771: \$? = $ac_status" >&5
++  echo "$as_me:10775: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -10779,19 +10783,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		if test $cf_XOPEN_SOURCE_set_ok = no
+ 		then
+-			{ echo "$as_me:10782: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:10786: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:10787: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10791: 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 10794 "configure"
++#line 10798 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10810,16 +10814,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10813: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10817: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10816: \$? = $ac_status" >&5
++  echo "$as_me:10820: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10822: \$? = $ac_status" >&5
++  echo "$as_me:10826: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10831,7 +10835,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 10834 "configure"
++#line 10838 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10850,16 +10854,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10853: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10857: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10856: \$? = $ac_status" >&5
++  echo "$as_me:10860: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10862: \$? = $ac_status" >&5
++  echo "$as_me:10866: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10874,7 +10878,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:10877: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10881: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10997,14 +11001,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:11000: checking if SIGWINCH is defined" >&5
++echo "$as_me:11004: 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 11007 "configure"
++#line 11011 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11019,23 +11023,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11022: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11026: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11025: \$? = $ac_status" >&5
++  echo "$as_me:11029: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11028: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11032: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11031: \$? = $ac_status" >&5
++  echo "$as_me:11035: \$? = $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 11038 "configure"
++#line 11042 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11053,16 +11057,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11056: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11060: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11059: \$? = $ac_status" >&5
++  echo "$as_me:11063: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11062: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11065: \$? = $ac_status" >&5
++  echo "$as_me:11069: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -11076,11 +11080,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11079: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:11083: 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:11083: checking for actual SIGWINCH definition" >&5
++echo "$as_me:11087: 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
+@@ -11091,7 +11095,7 @@
+ while test $cf_sigwinch != 1
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11094 "configure"
++#line 11098 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11113,16 +11117,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11116: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11120: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11119: \$? = $ac_status" >&5
++  echo "$as_me:11123: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11122: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11126: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11125: \$? = $ac_status" >&5
++  echo "$as_me:11129: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -11136,7 +11140,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11139: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:11143: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -11146,13 +11150,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:11149: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:11153: 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 11155 "configure"
++#line 11159 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11164,16 +11168,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11167: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11171: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11170: \$? = $ac_status" >&5
++  echo "$as_me:11174: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11173: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11177: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11176: \$? = $ac_status" >&5
++  echo "$as_me:11180: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -11184,7 +11188,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11187: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:11191: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test $am_cv_langinfo_codeset = yes; then
+ 
+@@ -11198,7 +11202,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:11201: checking if you want wide-character code" >&5
++echo "$as_me:11205: 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.
+@@ -11208,7 +11212,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:11211: result: $with_widec" >&5
++echo "$as_me:11215: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -11232,23 +11236,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11235: checking for $ac_header" >&5
++echo "$as_me:11239: 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 11241 "configure"
++#line 11245 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11245: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11249: \"$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:11251: \$? = $ac_status" >&5
++  echo "$as_me:11255: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11267,7 +11271,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:11270: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:11274: 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 <&5
++echo "$as_me:11284: checking if wchar.h can be used as is" >&5
+ echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
+ if test "${cf_cv_wchar_h_okay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11287 "configure"
++#line 11291 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11306,16 +11310,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11309: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11313: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11312: \$? = $ac_status" >&5
++  echo "$as_me:11316: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11319: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11318: \$? = $ac_status" >&5
++  echo "$as_me:11322: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -11325,16 +11329,16 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11328: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:11332: result: $cf_cv_wchar_h_okay" >&5
+ echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
+ 
+ if test $cf_cv_wchar_h_okay = no
+ then
+ 
+-echo "$as_me:11334: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:11338: 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 11337 "configure"
++#line 11341 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -11350,16 +11354,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11353: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11357: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11356: \$? = $ac_status" >&5
++  echo "$as_me:11360: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11363: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11362: \$? = $ac_status" >&5
++  echo "$as_me:11366: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=no
+ else
+@@ -11368,16 +11372,16 @@
+ cf_result=yes
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:11371: result: $cf_result" >&5
++echo "$as_me:11375: 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:11377: checking checking for compatible value versus " >&5
++	echo "$as_me:11381: 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 11380 "configure"
++#line 11384 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -11393,16 +11397,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11396: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11400: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11399: \$? = $ac_status" >&5
++  echo "$as_me:11403: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11406: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11405: \$? = $ac_status" >&5
++  echo "$as_me:11409: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -11411,7 +11415,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:11414: result: $cf_result" >&5
++	echo "$as_me:11418: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -11421,7 +11425,7 @@
+ 
+ fi
+ 
+-echo "$as_me:11424: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:11428: checking if wcwidth agrees graphics are single-width" >&5
+ echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
+ if test "${cf_cv_wcwidth_graphics+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11492,7 +11496,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11495 "configure"
++#line 11499 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11536,15 +11540,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:11539: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11543: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11542: \$? = $ac_status" >&5
++  echo "$as_me:11546: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:11544: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11548: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11547: \$? = $ac_status" >&5
++  echo "$as_me:11551: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -11557,7 +11561,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:11560: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:11564: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -11568,13 +11572,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:11571: checking for $ac_func" >&5
++echo "$as_me:11575: 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 11577 "configure"
++#line 11581 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11605,16 +11609,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11608: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11612: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11611: \$? = $ac_status" >&5
++  echo "$as_me:11615: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11618: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11617: \$? = $ac_status" >&5
++  echo "$as_me:11621: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -11624,7 +11628,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11627: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:11631: 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 <&5
++echo "$as_me:11643: 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
+@@ -11644,7 +11648,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11647 "configure"
++#line 11651 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11657,16 +11661,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11660: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11664: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11663: \$? = $ac_status" >&5
++  echo "$as_me:11667: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11666: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11669: \$? = $ac_status" >&5
++  echo "$as_me:11673: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -11678,12 +11682,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:11681: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:11685: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11686 "configure"
++#line 11690 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11696,16 +11700,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11703: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11702: \$? = $ac_status" >&5
++  echo "$as_me:11706: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11705: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11709: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11708: \$? = $ac_status" >&5
++  echo "$as_me:11712: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -11719,7 +11723,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11722 "configure"
++#line 11726 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11732,16 +11736,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11739: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11738: \$? = $ac_status" >&5
++  echo "$as_me:11742: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11744: \$? = $ac_status" >&5
++  echo "$as_me:11748: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -11758,9 +11762,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:11761: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:11765: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:11763: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:11767: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -11851,7 +11855,7 @@
+ 		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}:11854: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:11858: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -11859,7 +11863,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 11862 "configure"
++#line 11866 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11872,21 +11876,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11875: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11879: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11878: \$? = $ac_status" >&5
++  echo "$as_me:11882: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11884: \$? = $ac_status" >&5
++  echo "$as_me:11888: \$? = $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}:11889: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:11893: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -11904,7 +11908,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:11907: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:11911: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -11979,13 +11983,13 @@
+ 				if test -d $cf_cv_library_path_utf8 ; then
+ 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:11982: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:11986: 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 11988 "configure"
++#line 11992 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11998,21 +12002,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12001: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12005: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12004: \$? = $ac_status" >&5
++  echo "$as_me:12008: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12007: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12011: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12010: \$? = $ac_status" >&5
++  echo "$as_me:12014: \$? = $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}:12015: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12019: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -12054,7 +12058,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12057: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:12061: 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
+@@ -12092,7 +12096,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 12095 "configure"
++#line 12099 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12104,16 +12108,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12107: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12111: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12110: \$? = $ac_status" >&5
++  echo "$as_me:12114: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12113: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12116: \$? = $ac_status" >&5
++  echo "$as_me:12120: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12130,7 +12134,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:12133: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12137: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12166,7 +12170,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}:12169: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:12173: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -12198,14 +12202,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:12201: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:12205: 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 12208 "configure"
++#line 12212 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12223,23 +12227,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12226: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12230: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12229: \$? = $ac_status" >&5
++  echo "$as_me:12233: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12232: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12235: \$? = $ac_status" >&5
++  echo "$as_me:12239: \$? = $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 12242 "configure"
++#line 12246 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12258,16 +12262,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12261: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12265: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12264: \$? = $ac_status" >&5
++  echo "$as_me:12268: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12267: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12271: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12270: \$? = $ac_status" >&5
++  echo "$as_me:12274: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -12279,7 +12283,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12282: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:12286: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -12297,14 +12301,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:12300: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:12304: 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 12307 "configure"
++#line 12311 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12322,23 +12326,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12325: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12329: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12328: \$? = $ac_status" >&5
++  echo "$as_me:12332: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12335: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12334: \$? = $ac_status" >&5
++  echo "$as_me:12338: \$? = $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 12341 "configure"
++#line 12345 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12357,16 +12361,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12360: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12364: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12363: \$? = $ac_status" >&5
++  echo "$as_me:12367: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12369: \$? = $ac_status" >&5
++  echo "$as_me:12373: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -12378,7 +12382,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12381: result: $cf_cv_wchar_t" >&5
++echo "$as_me:12385: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -12401,14 +12405,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:12404: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:12408: 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 12411 "configure"
++#line 12415 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12426,23 +12430,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12429: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12433: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12432: \$? = $ac_status" >&5
++  echo "$as_me:12436: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12435: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12438: \$? = $ac_status" >&5
++  echo "$as_me:12442: \$? = $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 12445 "configure"
++#line 12449 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12461,16 +12465,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12464: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12468: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12467: \$? = $ac_status" >&5
++  echo "$as_me:12471: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12470: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12473: \$? = $ac_status" >&5
++  echo "$as_me:12477: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -12482,7 +12486,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12485: result: $cf_cv_wint_t" >&5
++echo "$as_me:12489: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -12514,7 +12518,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:12517: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:12521: 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.
+@@ -12524,7 +12528,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:12527: result: $with_lp64" >&5
++echo "$as_me:12531: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -12540,7 +12544,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:12543: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:12547: 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
+@@ -12552,7 +12556,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 12555 "configure"
++#line 12559 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12572,16 +12576,16 @@
+ }
+ _ACEOF
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12575: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12578: \$? = $ac_status" >&5
++  echo "$as_me:12582: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12584: \$? = $ac_status" >&5
++  echo "$as_me:12588: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12591,16 +12595,16 @@
+ rm -f conftest.$ac_objext
+      	 CC="$CC -n32"
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12594: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12598: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12597: \$? = $ac_status" >&5
++  echo "$as_me:12601: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12600: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12604: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12603: \$? = $ac_status" >&5
++  echo "$as_me:12607: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -12614,13 +12618,13 @@
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-echo "$as_me:12617: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:12621: 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:12623: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:12627: 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
+@@ -12628,7 +12632,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12631 "configure"
++#line 12635 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12648,16 +12652,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12651: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12655: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12654: \$? = $ac_status" >&5
++  echo "$as_me:12658: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12657: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12661: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12660: \$? = $ac_status" >&5
++  echo "$as_me:12664: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12666,7 +12670,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12669 "configure"
++#line 12673 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -12687,16 +12691,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12690: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12694: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12693: \$? = $ac_status" >&5
++  echo "$as_me:12697: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12699: \$? = $ac_status" >&5
++  echo "$as_me:12703: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -12707,7 +12711,7 @@
+   break
+ done
+ fi
+-echo "$as_me:12710: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:12714: 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
+ 
+@@ -12717,7 +12721,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:12720: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:12724: 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
+@@ -12725,7 +12729,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12728 "configure"
++#line 12732 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -12745,16 +12749,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12748: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12752: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12751: \$? = $ac_status" >&5
++  echo "$as_me:12755: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12754: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12757: \$? = $ac_status" >&5
++  echo "$as_me:12761: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12763,7 +12767,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12766 "configure"
++#line 12770 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -12784,16 +12788,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12787: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12791: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12790: \$? = $ac_status" >&5
++  echo "$as_me:12794: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12793: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12797: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12796: \$? = $ac_status" >&5
++  echo "$as_me:12800: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -12804,7 +12808,7 @@
+   break
+ done
+ fi
+-echo "$as_me:12807: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:12811: 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
+ 
+@@ -12817,7 +12821,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:12820: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:12824: 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
+@@ -12825,7 +12829,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12828 "configure"
++#line 12832 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12837,16 +12841,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12840: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12844: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12843: \$? = $ac_status" >&5
++  echo "$as_me:12847: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12850: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12849: \$? = $ac_status" >&5
++  echo "$as_me:12853: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -12855,7 +12859,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12858 "configure"
++#line 12862 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -12868,16 +12872,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12871: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12875: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12874: \$? = $ac_status" >&5
++  echo "$as_me:12878: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12877: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12881: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12880: \$? = $ac_status" >&5
++  echo "$as_me:12884: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -12888,7 +12892,7 @@
+   break
+ done
+ fi
+-echo "$as_me:12891: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:12895: 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
+ 
+@@ -12902,13 +12906,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:12905: checking for fseeko" >&5
++echo "$as_me:12909: 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 12911 "configure"
++#line 12915 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12920,16 +12924,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12927: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12926: \$? = $ac_status" >&5
++  echo "$as_me:12930: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12932: \$? = $ac_status" >&5
++  echo "$as_me:12936: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -12939,7 +12943,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12942: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:12946: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -12978,14 +12982,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:12981: checking whether to use struct dirent64" >&5
++	echo "$as_me:12985: 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 12988 "configure"
++#line 12992 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -13007,16 +13011,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13013: \$? = $ac_status" >&5
++  echo "$as_me:13017: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13019: \$? = $ac_status" >&5
++  echo "$as_me:13023: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -13027,7 +13031,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13030: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13034: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13037,7 +13041,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:13040: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:13044: 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.
+@@ -13047,14 +13051,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:13050: result: $with_tparm_varargs" >&5
++echo "$as_me:13054: result: $with_tparm_varargs" >&5
+ echo "${ECHO_T}$with_tparm_varargs" >&6
+ NCURSES_TPARM_VARARGS=0
+ test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
+ 
+ ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
+ if test "$with_ticlib" != no ; then
+-echo "$as_me:13057: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:13061: 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.
+@@ -13064,14 +13068,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:13067: result: $with_tic_depends" >&5
++echo "$as_me:13071: result: $with_tic_depends" >&5
+ echo "${ECHO_T}$with_tic_depends" >&6
+ else
+ 	with_tic_depends=no
+ fi
+ 
+ ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
+-echo "$as_me:13074: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
++echo "$as_me:13078: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
+ echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
+ 
+ # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
+@@ -13083,15 +13087,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:13086: result: yes" >&5
++	echo "$as_me:13090: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:13090: result: no" >&5
++	echo "$as_me:13094: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13094: checking for X11 rgb file" >&5
++echo "$as_me:13098: checking for X11 rgb file" >&5
+ echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
+ 
+ # Check whether --with-x11-rgb or --without-x11-rgb was given.
+@@ -13155,7 +13159,7 @@
+ 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:13158: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:13162: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -13163,7 +13167,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13166: result: $RGB_PATH" >&5
++echo "$as_me:13170: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:13184: 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.
+@@ -13187,10 +13191,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:13190: result: $NCURSES_BOOL" >&5
++echo "$as_me:13194: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:13193: checking for alternate terminal capabilities file" >&5
++echo "$as_me:13197: 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.
+@@ -13201,11 +13205,11 @@
+   TERMINFO_CAPS=Caps
+ fi;
+ test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:13204: result: $TERMINFO_CAPS" >&5
++echo "$as_me:13208: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:13208: checking for type of chtype" >&5
++echo "$as_me:13212: 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.
+@@ -13215,11 +13219,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:13218: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:13222: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:13222: checking for type of ospeed" >&5
++echo "$as_me:13226: 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.
+@@ -13229,11 +13233,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:13232: result: $NCURSES_OSPEED" >&5
++echo "$as_me:13236: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:13236: checking for type of mmask_t" >&5
++echo "$as_me:13240: 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.
+@@ -13243,11 +13247,11 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:13246: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:13250: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:13250: checking for size CCHARW_MAX" >&5
++echo "$as_me:13254: checking for size CCHARW_MAX" >&5
+ echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
+ 
+ # Check whether --with-ccharw-max or --without-ccharw-max was given.
+@@ -13257,16 +13261,16 @@
+ else
+   NCURSES_CCHARW_MAX=5
+ fi;
+-echo "$as_me:13260: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:13264: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:13263: checking for ANSI C header files" >&5
++echo "$as_me:13267: 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 13269 "configure"
++#line 13273 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -13274,13 +13278,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:13277: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13281: \"$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:13283: \$? = $ac_status" >&5
++  echo "$as_me:13287: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13302,7 +13306,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 13305 "configure"
++#line 13309 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -13320,7 +13324,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 13323 "configure"
++#line 13327 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -13341,7 +13345,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13344 "configure"
++#line 13348 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -13367,15 +13371,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13370: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13374: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13373: \$? = $ac_status" >&5
++  echo "$as_me:13377: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13375: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13379: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13378: \$? = $ac_status" >&5
++  echo "$as_me:13382: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -13388,7 +13392,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:13391: result: $ac_cv_header_stdc" >&5
++echo "$as_me:13395: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -13404,28 +13408,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13407: checking for $ac_header" >&5
++echo "$as_me:13411: 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 13413 "configure"
++#line 13417 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13419: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13423: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13422: \$? = $ac_status" >&5
++  echo "$as_me:13426: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13428: \$? = $ac_status" >&5
++  echo "$as_me:13432: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -13435,7 +13439,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13438: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13442: 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 <&5
++echo "$as_me:13452: 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 13454 "configure"
++#line 13458 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13466,16 +13470,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13469: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13473: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13472: \$? = $ac_status" >&5
++  echo "$as_me:13476: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13475: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13478: \$? = $ac_status" >&5
++  echo "$as_me:13482: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -13485,10 +13489,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13488: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:13492: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:13491: checking size of signed char" >&5
++echo "$as_me:13495: 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
+@@ -13497,7 +13501,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13500 "configure"
++#line 13504 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13509,21 +13513,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13512: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13516: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13515: \$? = $ac_status" >&5
++  echo "$as_me:13519: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13521: \$? = $ac_status" >&5
++  echo "$as_me:13525: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13526 "configure"
++#line 13530 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13535,16 +13539,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13538: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13542: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13541: \$? = $ac_status" >&5
++  echo "$as_me:13545: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13544: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13548: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13547: \$? = $ac_status" >&5
++  echo "$as_me:13551: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -13560,7 +13564,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13563 "configure"
++#line 13567 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13572,16 +13576,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13575: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13578: \$? = $ac_status" >&5
++  echo "$as_me:13582: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13584: \$? = $ac_status" >&5
++  echo "$as_me:13588: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -13597,7 +13601,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 13600 "configure"
++#line 13604 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13609,16 +13613,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13612: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13616: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13615: \$? = $ac_status" >&5
++  echo "$as_me:13619: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13618: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13622: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13621: \$? = $ac_status" >&5
++  echo "$as_me:13625: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -13631,12 +13635,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:13634: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:13638: 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 13639 "configure"
++#line 13643 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13652,15 +13656,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13655: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13659: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13658: \$? = $ac_status" >&5
++  echo "$as_me:13662: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13664: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13663: \$? = $ac_status" >&5
++  echo "$as_me:13667: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -13676,7 +13680,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:13679: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:13683: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:13694: 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.
+@@ -13697,12 +13701,12 @@
+ else
+   with_signed_char=no
+ fi;
+-echo "$as_me:13700: result: $with_signed_char" >&5
++echo "$as_me:13704: result: $with_signed_char" >&5
+ echo "${ECHO_T}$with_signed_char" >&6
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+ 
+ ###   use option --with-tparm-arg to override tparm's argument type
+-echo "$as_me:13705: checking for type of tparm args" >&5
++echo "$as_me:13709: checking for type of tparm args" >&5
+ echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -13712,11 +13716,11 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:13715: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:13719: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:13719: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:13723: 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.
+@@ -13726,7 +13730,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:13729: result: $with_rcs_ids" >&5
++echo "$as_me:13733: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -13735,7 +13739,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:13738: checking format of man-pages" >&5
++echo "$as_me:13742: 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.
+@@ -13824,14 +13828,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:13827: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:13831: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:13830: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:13834: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:13834: checking for manpage renaming" >&5
++echo "$as_me:13838: 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.
+@@ -13859,7 +13863,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:13862: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:13866: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -13873,10 +13877,10 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:13876: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:13880: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:13879: checking if manpage aliases will be installed" >&5
++echo "$as_me:13883: 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.
+@@ -13887,7 +13891,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:13890: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:13894: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -13901,7 +13905,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:13904: checking if manpage symlinks should be used" >&5
++echo "$as_me:13908: 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.
+@@ -13914,17 +13918,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:13917: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:13921: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:13923: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:13927: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:13927: checking for manpage tbl" >&5
++echo "$as_me:13931: 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.
+@@ -13935,7 +13939,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:13938: result: $MANPAGE_TBL" >&5
++echo "$as_me:13942: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -14268,7 +14272,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:14271: checking if you want to build with function extensions" >&5
++echo "$as_me:14275: 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.
+@@ -14278,7 +14282,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:14281: result: $with_ext_funcs" >&5
++echo "$as_me:14285: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -14338,7 +14342,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:14341: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:14345: checking if you want to build with SCREEN extensions" >&5
+ echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
+@@ -14348,7 +14352,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:14351: result: $with_sp_funcs" >&5
++echo "$as_me:14355: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -14367,7 +14371,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:14370: checking if you want to build with terminal-driver" >&5
++echo "$as_me:14374: checking if you want to build with terminal-driver" >&5
+ echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
+ 
+ # Check whether --enable-term-driver or --disable-term-driver was given.
+@@ -14377,7 +14381,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:14380: result: $with_term_driver" >&5
++echo "$as_me:14384: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -14386,19 +14390,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:14389: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:14393: error: The term-driver option conflicts with the termlib option" >&5
+ echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 	if test "x$with_sp_funcs" != xyes ; then
+-		{ { echo "$as_me:14394: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:14398: error: The term-driver option relies upon sp-funcs" >&5
+ echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:14401: checking for extended use of const keyword" >&5
++echo "$as_me:14405: 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.
+@@ -14408,7 +14412,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:14411: result: $with_ext_const" >&5
++echo "$as_me:14415: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -14416,7 +14420,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:14419: checking if you want to use extended colors" >&5
++echo "$as_me:14423: 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.
+@@ -14426,12 +14430,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:14429: result: $with_ext_colors" >&5
++echo "$as_me:14433: result: $with_ext_colors" >&5
+ echo "${ECHO_T}$with_ext_colors" >&6
+ NCURSES_EXT_COLORS=0
+ if test "x$with_ext_colors" = xyes ; then
+ 	if test "x$with_widec" != xyes ; then
+-		{ echo "$as_me:14434: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:14438: WARNING: This option applies only to wide-character library" >&5
+ echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
+ 	else
+ 		# cannot be ABI 5 since it changes sizeof(cchar_t)
+@@ -14441,7 +14445,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:14444: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:14448: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -14469,7 +14473,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:14472: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:14476: 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.
+@@ -14479,7 +14483,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:14482: result: $with_ext_mouse" >&5
++echo "$as_me:14486: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+@@ -14490,7 +14494,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:14493: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:14497: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -14499,7 +14503,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:14502: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:14506: checking if you want to use extended putwin/screendump" >&5
+ echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
+@@ -14509,7 +14513,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:14512: result: $with_ext_putwin" >&5
++echo "$as_me:14516: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -14519,7 +14523,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14522: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:14526: 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.
+@@ -14529,7 +14533,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:14532: result: $with_no_padding" >&5
++echo "$as_me:14536: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14537,7 +14541,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:14540: checking if you want SIGWINCH handler" >&5
++echo "$as_me:14544: 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.
+@@ -14547,7 +14551,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:14550: result: $with_sigwinch" >&5
++echo "$as_me:14554: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14555,7 +14559,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:14558: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:14562: 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.
+@@ -14565,14 +14569,14 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:14568: result: $with_tcap_names" >&5
++echo "$as_me:14572: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+ 
+ ##############################################################################
+ 
+-echo "$as_me:14575: checking if you want to link with the pthread library" >&5
++echo "$as_me:14579: 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.
+@@ -14582,27 +14586,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:14585: result: $with_pthread" >&5
++echo "$as_me:14589: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:14589: checking for pthread.h" >&5
++	echo "$as_me:14593: 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 14595 "configure"
++#line 14599 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:14599: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14603: \"$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:14605: \$? = $ac_status" >&5
++  echo "$as_me:14609: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14621,7 +14625,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14624: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:14628: 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
+ 
+@@ -14631,7 +14635,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:14634: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:14638: checking if we can link with the $cf_lib_pthread library" >&5
+ echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
+ 	    cf_save_LIBS="$LIBS"
+ 
+@@ -14652,7 +14656,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+-#line 14655 "configure"
++#line 14659 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14669,16 +14673,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14672: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14676: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14675: \$? = $ac_status" >&5
++  echo "$as_me:14679: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14678: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14682: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14681: \$? = $ac_status" >&5
++  echo "$as_me:14685: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_pthread=yes
+ else
+@@ -14688,7 +14692,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:14691: result: $with_pthread" >&5
++	    echo "$as_me:14695: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -14716,7 +14720,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:14719: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:14723: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14726,13 +14730,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:14729: checking for pthread_kill" >&5
++	echo "$as_me:14733: checking for pthread_kill" >&5
+ echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
+ if test "${ac_cv_func_pthread_kill+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14735 "configure"
++#line 14739 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14763,16 +14767,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14766: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14770: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14769: \$? = $ac_status" >&5
++  echo "$as_me:14773: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14772: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14775: \$? = $ac_status" >&5
++  echo "$as_me:14779: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -14782,11 +14786,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14785: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:14789: result: $ac_cv_func_pthread_kill" >&5
+ echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
+ if test $ac_cv_func_pthread_kill = yes; then
+ 
+-		echo "$as_me:14789: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:14793: checking if you want to allow EINTR in wgetch with pthreads" >&5
+ echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
+@@ -14796,7 +14800,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:14799: result: $use_pthreads_eintr" >&5
++		echo "$as_me:14803: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -14807,7 +14811,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:14810: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:14814: 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.
+@@ -14817,18 +14821,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:14820: result: $use_weak_symbols" >&5
++	echo "$as_me:14824: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:14824: checking if $CC supports weak symbols" >&5
++echo "$as_me:14828: 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 14831 "configure"
++#line 14835 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14854,16 +14858,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14860: \$? = $ac_status" >&5
++  echo "$as_me:14864: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14866: \$? = $ac_status" >&5
++  echo "$as_me:14870: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -14874,7 +14878,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:14877: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:14881: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -14924,7 +14928,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:14927: checking if you want reentrant code" >&5
++echo "$as_me:14931: checking if you want reentrant code" >&5
+ echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
+ 
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -14934,7 +14938,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:14937: result: $with_reentrant" >&5
++echo "$as_me:14941: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15022,7 +15026,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15025: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15029: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15034,7 +15038,7 @@
+ 	NCURSES_SIZE_T=short
+ fi
+ 
+-echo "$as_me:15037: checking if you want opaque curses-library structures" >&5
++echo "$as_me:15041: checking if you want opaque curses-library structures" >&5
+ echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -15056,16 +15060,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
+ 
+ fi;
+-echo "$as_me:15059: result: $enable_opaque_curses" >&5
++echo "$as_me:15063: result: $enable_opaque_curses" >&5
+ echo "${ECHO_T}$enable_opaque_curses" >&6
+ 
+ test "$cf_cv_enable_reentrant" = 1 && \
+ test "$enable_opaque_curses" = no && \
+-{ { echo "$as_me:15064: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:15068: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:15068: checking if you want opaque form-library structures" >&5
++echo "$as_me:15072: checking if you want opaque form-library structures" >&5
+ echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -15075,10 +15079,10 @@
+ else
+   enable_opaque_form=no
+ fi;
+-echo "$as_me:15078: result: $enable_opaque_form" >&5
++echo "$as_me:15082: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:15081: checking if you want opaque menu-library structures" >&5
++echo "$as_me:15085: checking if you want opaque menu-library structures" >&5
+ echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -15088,10 +15092,10 @@
+ else
+   enable_opaque_menu=no
+ fi;
+-echo "$as_me:15091: result: $enable_opaque_menu" >&5
++echo "$as_me:15095: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:15094: checking if you want opaque panel-library structures" >&5
++echo "$as_me:15098: checking if you want opaque panel-library structures" >&5
+ echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -15101,7 +15105,7 @@
+ else
+   enable_opaque_panel=no
+ fi;
+-echo "$as_me:15104: result: $enable_opaque_panel" >&5
++echo "$as_me:15108: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -15111,7 +15115,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15114: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15118: checking for prefix used to wrap public variables" >&5
+ echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
+ 
+ # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
+@@ -15121,7 +15125,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15124: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15128: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15134,7 +15138,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15137: checking if you want all development code" >&5
++echo "$as_me:15141: 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.
+@@ -15144,11 +15148,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15147: result: $with_develop" >&5
++echo "$as_me:15151: 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:15151: checking if you want hard-tabs code" >&5
++echo "$as_me:15155: 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.
+@@ -15158,7 +15162,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:15161: result: $enable_hard_tabs" >&5
++echo "$as_me:15165: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15166,7 +15170,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:15169: checking if you want limited support for xmc" >&5
++echo "$as_me:15173: 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.
+@@ -15176,7 +15180,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:15179: result: $enable_xmc_glitch" >&5
++echo "$as_me:15183: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15186,7 +15190,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:15189: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15193: 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.
+@@ -15196,7 +15200,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:15199: result: $with_assumed_color" >&5
++echo "$as_me:15203: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15204,7 +15208,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:15207: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:15211: 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.
+@@ -15214,7 +15218,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:15217: result: $with_hashmap" >&5
++echo "$as_me:15221: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15222,7 +15226,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:15225: checking if you want colorfgbg code" >&5
++echo "$as_me:15229: 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.
+@@ -15232,7 +15236,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:15235: result: $with_colorfgbg" >&5
++echo "$as_me:15239: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15240,7 +15244,7 @@
+ EOF
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:15243: checking if you want interop bindings" >&5
++echo "$as_me:15247: checking if you want interop bindings" >&5
+ echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
+ 
+ # Check whether --enable-interop or --disable-interop was given.
+@@ -15250,13 +15254,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:15253: result: $with_exp_interop" >&5
++echo "$as_me:15257: result: $with_exp_interop" >&5
+ echo "${ECHO_T}$with_exp_interop" >&6
+ 
+ NCURSES_INTEROP_FUNCS=0
+ test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
+ 
+-echo "$as_me:15259: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:15263: 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.
+@@ -15266,13 +15270,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:15269: result: $with_safe_sprintf" >&5
++echo "$as_me:15273: result: $with_safe_sprintf" >&5
+ echo "${ECHO_T}$with_safe_sprintf" >&6
+ 
+ ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
+ # when hashmap is used scroll hints are useless
+ if test "$with_hashmap" = no ; then
+-echo "$as_me:15275: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:15279: 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.
+@@ -15282,7 +15286,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:15285: result: $with_scroll_hints" >&5
++echo "$as_me:15289: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15291,7 +15295,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15294: checking if you want wgetch-events code" >&5
++echo "$as_me:15298: checking if you want wgetch-events code" >&5
+ echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
+ 
+ # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
+@@ -15301,7 +15305,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:15304: result: $with_wgetch_events" >&5
++echo "$as_me:15308: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ test "x$with_wgetch_events" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15312,7 +15316,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15315: checking if you want to see long compiling messages" >&5
++echo "$as_me:15319: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -15346,7 +15350,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:15349: result: $enableval" >&5
++echo "$as_me:15353: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -15359,7 +15363,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:15362: checking if you want to install stripped executables" >&5
++echo "$as_me:15366: checking if you want to install stripped executables" >&5
+ echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
+ 
+ # Check whether --enable-stripping or --disable-stripping was given.
+@@ -15376,7 +15380,7 @@
+ 	with_stripping=yes
+ 
+ fi;
+-echo "$as_me:15379: result: $with_stripping" >&5
++echo "$as_me:15383: result: $with_stripping" >&5
+ echo "${ECHO_T}$with_stripping" >&6
+ 
+ if test "$with_stripping" = yes
+@@ -15387,7 +15391,7 @@
+ fi
+ 
+ : ${INSTALL:=install}
+-echo "$as_me:15390: checking if install accepts -p option" >&5
++echo "$as_me:15394: checking if install accepts -p option" >&5
+ echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
+ if test "${cf_cv_install_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15418,10 +15422,10 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:15421: result: $cf_cv_install_p" >&5
++echo "$as_me:15425: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:15424: checking if install needs to be told about ownership" >&5
++echo "$as_me:15428: checking if install needs to be told about ownership" >&5
+ echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
+ case `$ac_config_guess` in
+ (*minix)
+@@ -15432,7 +15436,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15435: result: $with_install_o" >&5
++echo "$as_me:15439: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -15456,7 +15460,7 @@
+ fi
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:15459: checking if you want to see compiler warnings" >&5
++echo "$as_me:15463: 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.
+@@ -15464,7 +15468,7 @@
+   enableval="$enable_warnings"
+   with_warnings=$enableval
+ fi;
+-echo "$as_me:15467: result: $with_warnings" >&5
++echo "$as_me:15471: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ 
+ if test "x$with_warnings" = "xyes"; then
+@@ -15490,7 +15494,7 @@
+ done
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15493 "configure"
++#line 15497 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15505,26 +15509,26 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15508: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15512: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15511: \$? = $ac_status" >&5
++  echo "$as_me:15515: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15514: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15517: \$? = $ac_status" >&5
++  echo "$as_me:15521: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-echo "$as_me:15520: checking for X11/Xt const-feature" >&5
++echo "$as_me:15524: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15527 "configure"
++#line 15531 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -15541,16 +15545,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15544: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15547: \$? = $ac_status" >&5
++  echo "$as_me:15551: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15550: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15553: \$? = $ac_status" >&5
++  echo "$as_me:15557: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -15565,7 +15569,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:15568: result: $cf_cv_const_x_string" >&5
++echo "$as_me:15572: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -15594,7 +15598,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+  fi
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:15617: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -15626,12 +15630,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15629: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15633: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15632: \$? = $ac_status" >&5
++  echo "$as_me:15636: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15634: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15638: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -15639,7 +15643,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:15642: checking for $CC warning options..." >&5
++	{ echo "$as_me:15646: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -15663,12 +15667,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15666: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15670: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15669: \$? = $ac_status" >&5
++  echo "$as_me:15673: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15671: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15675: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Winline)
+@@ -15676,7 +15680,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15679: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15683: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15686,7 +15690,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15689: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15693: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15706,12 +15710,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:15709: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:15713: 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 15714 "configure"
++#line 15718 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15728,16 +15732,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15731: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15735: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15734: \$? = $ac_status" >&5
++  echo "$as_me:15738: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15740: \$? = $ac_status" >&5
++  echo "$as_me:15744: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -15748,7 +15752,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:15751: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:15755: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -15757,12 +15761,12 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:15760: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:15764: checking if this is really Clang C++ compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
+ 	cf_save_CFLAGS="$CXXFLAGS"
+ 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15765 "configure"
++#line 15769 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15779,16 +15783,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15782: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15786: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15785: \$? = $ac_status" >&5
++  echo "$as_me:15789: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15792: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15791: \$? = $ac_status" >&5
++  echo "$as_me:15795: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -15799,7 +15803,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:15802: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:15806: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -15811,7 +15815,7 @@
+ ac_main_return=return
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:15836: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -15846,12 +15850,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15849: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15853: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15852: \$? = $ac_status" >&5
++  echo "$as_me:15856: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15854: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15858: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -15860,7 +15864,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:15863: checking for $CXX warning options..." >&5
++	{ echo "$as_me:15867: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -15890,16 +15894,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:15893: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15897: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15896: \$? = $ac_status" >&5
++  echo "$as_me:15900: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15898: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15902: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:15902: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15906: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -15935,10 +15939,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:15938: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:15942: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:15994: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15993: \$? = $ac_status" >&5
++  echo "$as_me:15997: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15995: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:15999: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -16051,7 +16055,7 @@
+ rm -rf conftest*
+ fi
+ 
+-echo "$as_me:16054: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:16058: checking if you want to work around bogus compiler/loader warnings" >&5
+ echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-string-hacks or --disable-string-hacks was given.
+@@ -16061,7 +16065,7 @@
+ else
+   with_string_hacks=no
+ fi;
+-echo "$as_me:16064: result: $with_string_hacks" >&5
++echo "$as_me:16068: result: $with_string_hacks" >&5
+ echo "${ECHO_T}$with_string_hacks" >&6
+ 
+ if test "x$with_string_hacks" = "xyes"; then
+@@ -16070,15 +16074,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:16073: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:16077: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+ echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
+-	echo "$as_me:16075: checking for strlcat" >&5
++	echo "$as_me:16079: checking for strlcat" >&5
+ echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
+ if test "${ac_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16081 "configure"
++#line 16085 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16109,16 +16113,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16112: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16115: \$? = $ac_status" >&5
++  echo "$as_me:16119: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16118: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16121: \$? = $ac_status" >&5
++  echo "$as_me:16125: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -16128,7 +16132,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16131: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:16135: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
+ 
+@@ -16138,7 +16142,7 @@
+ 
+ else
+ 
+-		echo "$as_me:16141: checking for strlcat in -lbsd" >&5
++		echo "$as_me:16145: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16146,7 +16150,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16149 "configure"
++#line 16153 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16165,16 +16169,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16172: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16171: \$? = $ac_status" >&5
++  echo "$as_me:16175: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16178: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16177: \$? = $ac_status" >&5
++  echo "$as_me:16181: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -16185,7 +16189,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16188: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:16192: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test $ac_cv_lib_bsd_strlcat = yes; then
+ 
+@@ -16208,23 +16212,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16211: checking for $ac_header" >&5
++echo "$as_me:16215: 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 16217 "configure"
++#line 16221 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:16221: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16225: \"$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:16227: \$? = $ac_status" >&5
++  echo "$as_me:16231: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16243,7 +16247,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16246: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:16250: 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 <&5
++echo "$as_me:16271: 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 16273 "configure"
++#line 16277 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16301,16 +16305,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16304: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16308: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16307: \$? = $ac_status" >&5
++  echo "$as_me:16311: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16314: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16313: \$? = $ac_status" >&5
++  echo "$as_me:16317: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -16320,7 +16324,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16323: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:16327: 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 <&5
++echo "$as_me:16340: 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.
+@@ -16343,7 +16347,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:16346: result: $with_assertions" >&5
++echo "$as_me:16350: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16359,7 +16363,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:16362: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:16366: 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.
+@@ -16376,7 +16380,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:16379: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:16383: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16490,23 +16494,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:16493: checking for dmalloc.h" >&5
++	echo "$as_me:16497: 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 16499 "configure"
++#line 16503 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16503: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16507: \"$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:16509: \$? = $ac_status" >&5
++  echo "$as_me:16513: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16525,11 +16529,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16528: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:16532: 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:16532: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:16536: 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
+@@ -16537,7 +16541,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16540 "configure"
++#line 16544 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16556,16 +16560,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16559: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16563: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16562: \$? = $ac_status" >&5
++  echo "$as_me:16566: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16565: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16569: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16568: \$? = $ac_status" >&5
++  echo "$as_me:16572: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -16576,7 +16580,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16579: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:16583: 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 <&5
++echo "$as_me:16598: 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.
+@@ -16608,7 +16612,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:16611: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:16615: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16722,23 +16726,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:16725: checking for dbmalloc.h" >&5
++	echo "$as_me:16729: 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 16731 "configure"
++#line 16735 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16735: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16739: \"$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:16741: \$? = $ac_status" >&5
++  echo "$as_me:16745: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16757,11 +16761,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16760: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:16764: 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:16764: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:16768: 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
+@@ -16769,7 +16773,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16772 "configure"
++#line 16776 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16788,16 +16792,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16795: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16794: \$? = $ac_status" >&5
++  echo "$as_me:16798: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16800: \$? = $ac_status" >&5
++  echo "$as_me:16804: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -16808,7 +16812,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16811: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:16815: 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 <&5
++echo "$as_me:16830: 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.
+@@ -16840,7 +16844,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:16843: result: ${with_valgrind:-no}" >&5
++echo "$as_me:16847: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16953,7 +16957,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16956: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:16960: 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.
+@@ -16963,7 +16967,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:16966: result: $with_no_leaks" >&5
++echo "$as_me:16970: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -17015,7 +17019,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17018: checking whether to add trace feature to all models" >&5
++echo "$as_me:17022: 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.
+@@ -17025,7 +17029,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:17028: result: $cf_with_trace" >&5
++echo "$as_me:17032: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -17139,7 +17143,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:17142: checking if we want to use GNAT projects" >&5
++echo "$as_me:17146: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -17156,7 +17160,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:17159: result: $enable_gnat_projects" >&5
++echo "$as_me:17163: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -17166,13 +17170,13 @@
+ 	# Note: WINVER may be a problem with Windows 10
+ 	;;
+ (*)
+-echo "$as_me:17169: checking for gettimeofday" >&5
++echo "$as_me:17173: 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 17175 "configure"
++#line 17179 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17203,16 +17207,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17206: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17210: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17209: \$? = $ac_status" >&5
++  echo "$as_me:17213: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17212: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17216: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17215: \$? = $ac_status" >&5
++  echo "$as_me:17219: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -17222,7 +17226,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17225: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17229: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test $ac_cv_func_gettimeofday = yes; then
+ 
+@@ -17232,7 +17236,7 @@
+ 
+ else
+ 
+-echo "$as_me:17235: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17239: 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
+@@ -17240,7 +17244,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17243 "configure"
++#line 17247 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17259,16 +17263,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17262: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17266: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17265: \$? = $ac_status" >&5
++  echo "$as_me:17269: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17272: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17271: \$? = $ac_status" >&5
++  echo "$as_me:17275: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17279,7 +17283,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17282: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17286: 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
+ 
+@@ -17309,14 +17313,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17312: checking if -lm needed for math functions" >&5
++echo "$as_me:17316: 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 17319 "configure"
++#line 17323 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -17332,16 +17336,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17335: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17338: \$? = $ac_status" >&5
++  echo "$as_me:17342: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17341: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17344: \$? = $ac_status" >&5
++  echo "$as_me:17348: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -17351,7 +17355,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17354: result: $cf_cv_need_libm" >&5
++echo "$as_me:17358: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -17359,13 +17363,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:17362: checking for ANSI C header files" >&5
++echo "$as_me:17366: 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 17368 "configure"
++#line 17372 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17373,13 +17377,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:17376: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17380: \"$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:17382: \$? = $ac_status" >&5
++  echo "$as_me:17386: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17401,7 +17405,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 17404 "configure"
++#line 17408 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17419,7 +17423,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 17422 "configure"
++#line 17426 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17440,7 +17444,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17443 "configure"
++#line 17447 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -17466,15 +17470,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17469: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17473: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17472: \$? = $ac_status" >&5
++  echo "$as_me:17476: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17474: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17478: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17477: \$? = $ac_status" >&5
++  echo "$as_me:17481: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -17487,7 +17491,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:17490: result: $ac_cv_header_stdc" >&5
++echo "$as_me:17494: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -17500,13 +17504,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:17503: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:17507: 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 17509 "configure"
++#line 17513 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17521,16 +17525,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17528: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17527: \$? = $ac_status" >&5
++  echo "$as_me:17531: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17533: \$? = $ac_status" >&5
++  echo "$as_me:17537: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17540,7 +17544,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17543: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17547: 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 <&5
++  echo "$as_me:17560: 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
+@@ -17561,7 +17565,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17564 "configure"
++#line 17568 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17580,16 +17584,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17583: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17587: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17586: \$? = $ac_status" >&5
++  echo "$as_me:17590: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17593: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17592: \$? = $ac_status" >&5
++  echo "$as_me:17596: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17600,14 +17604,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17603: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17607: 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:17610: checking for opendir in -lx" >&5
++  echo "$as_me:17614: 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
+@@ -17615,7 +17619,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17618 "configure"
++#line 17622 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17634,16 +17638,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17637: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17641: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17640: \$? = $ac_status" >&5
++  echo "$as_me:17644: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17646: \$? = $ac_status" >&5
++  echo "$as_me:17650: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17654,7 +17658,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17657: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17661: 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"
+@@ -17662,13 +17666,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17665: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17669: 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 17671 "configure"
++#line 17675 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17684,16 +17688,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17687: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17691: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17690: \$? = $ac_status" >&5
++  echo "$as_me:17694: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17696: \$? = $ac_status" >&5
++  echo "$as_me:17700: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17703,7 +17707,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17706: result: $ac_cv_header_time" >&5
++echo "$as_me:17710: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17722,13 +17726,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17725: checking for regcomp" >&5
++echo "$as_me:17729: checking for regcomp" >&5
+ echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
+ if test "${ac_cv_func_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17731 "configure"
++#line 17735 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17759,16 +17763,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17762: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17766: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17765: \$? = $ac_status" >&5
++  echo "$as_me:17769: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17772: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17771: \$? = $ac_status" >&5
++  echo "$as_me:17775: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -17778,7 +17782,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17781: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:17785: result: $ac_cv_func_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_func_regcomp" >&6
+ if test $ac_cv_func_regcomp = yes; then
+   cf_regex_func=regcomp
+@@ -17787,7 +17791,7 @@
+ 	for cf_regex_lib in $cf_regex_libs
+ 	do
+ 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
+-echo "$as_me:17790: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:17794: checking for regcomp in -l$cf_regex_lib" >&5
+ echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17795,7 +17799,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17798 "configure"
++#line 17802 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17814,16 +17818,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17817: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17821: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17820: \$? = $ac_status" >&5
++  echo "$as_me:17824: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17827: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17826: \$? = $ac_status" >&5
++  echo "$as_me:17830: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17834,7 +17838,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17837: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:17841: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -17863,13 +17867,13 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:17866: checking for compile" >&5
++	echo "$as_me:17870: checking for compile" >&5
+ echo $ECHO_N "checking for compile... $ECHO_C" >&6
+ if test "${ac_cv_func_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17872 "configure"
++#line 17876 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17900,16 +17904,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17907: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17906: \$? = $ac_status" >&5
++  echo "$as_me:17910: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17909: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17913: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17912: \$? = $ac_status" >&5
++  echo "$as_me:17916: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -17919,13 +17923,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17922: result: $ac_cv_func_compile" >&5
++echo "$as_me:17926: result: $ac_cv_func_compile" >&5
+ echo "${ECHO_T}$ac_cv_func_compile" >&6
+ if test $ac_cv_func_compile = yes; then
+   cf_regex_func=compile
+ else
+ 
+-		echo "$as_me:17928: checking for compile in -lgen" >&5
++		echo "$as_me:17932: checking for compile in -lgen" >&5
+ echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
+ if test "${ac_cv_lib_gen_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17933,7 +17937,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17936 "configure"
++#line 17940 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17952,16 +17956,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17955: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17959: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17958: \$? = $ac_status" >&5
++  echo "$as_me:17962: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17964: \$? = $ac_status" >&5
++  echo "$as_me:17968: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -17972,7 +17976,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17975: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:17979: result: $ac_cv_lib_gen_compile" >&5
+ echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
+ if test $ac_cv_lib_gen_compile = yes; then
+ 
+@@ -18000,11 +18004,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:18003: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:18007: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:18007: checking for regular-expression headers" >&5
++echo "$as_me:18011: checking for regular-expression headers" >&5
+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
+ if test "${cf_cv_regex_hdrs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18016,7 +18020,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18019 "configure"
++#line 18023 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -18031,16 +18035,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18034: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18038: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18037: \$? = $ac_status" >&5
++  echo "$as_me:18041: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18040: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18044: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18043: \$? = $ac_status" >&5
++  echo "$as_me:18047: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -18057,7 +18061,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18060 "configure"
++#line 18064 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -18075,16 +18079,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18078: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18082: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18081: \$? = $ac_status" >&5
++  echo "$as_me:18085: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18087: \$? = $ac_status" >&5
++  echo "$as_me:18091: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -18100,11 +18104,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:18103: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:18107: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case $cf_cv_regex_hdrs in
+-	(no)		{ echo "$as_me:18107: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:18111: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -18143,23 +18147,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18146: checking for $ac_header" >&5
++echo "$as_me:18150: 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 18152 "configure"
++#line 18156 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18156: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18160: \"$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:18162: \$? = $ac_status" >&5
++  echo "$as_me:18166: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18178,7 +18182,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:18181: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18185: 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 <&5
++echo "$as_me:18198: 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 18200 "configure"
++#line 18204 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18204: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18208: \"$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:18210: \$? = $ac_status" >&5
++  echo "$as_me:18214: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18226,7 +18230,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:18229: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18233: 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 <&5
++echo "$as_me:18243: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18246,7 +18250,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18249 "configure"
++#line 18253 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18259,16 +18263,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18262: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18266: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18265: \$? = $ac_status" >&5
++  echo "$as_me:18269: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18272: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18271: \$? = $ac_status" >&5
++  echo "$as_me:18275: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -18280,7 +18284,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18283: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18287: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -18297,14 +18301,14 @@
+ 
+ fi
+ 
+-echo "$as_me:18300: checking if external environ is declared" >&5
++echo "$as_me:18304: checking if external environ is declared" >&5
+ echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 18307 "configure"
++#line 18311 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -18320,16 +18324,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18323: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18326: \$? = $ac_status" >&5
++  echo "$as_me:18330: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18333: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18332: \$? = $ac_status" >&5
++  echo "$as_me:18336: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -18340,7 +18344,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18343: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:18347: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -18355,14 +18359,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:18358: checking if external environ exists" >&5
++echo "$as_me:18362: checking if external environ exists" >&5
+ echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
+ if test "${cf_cv_have_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18365 "configure"
++#line 18369 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -18377,16 +18381,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18380: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18384: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18383: \$? = $ac_status" >&5
++  echo "$as_me:18387: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18386: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18390: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18389: \$? = $ac_status" >&5
++  echo "$as_me:18393: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -18397,7 +18401,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18400: result: $cf_cv_have_environ" >&5
++echo "$as_me:18404: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -18410,13 +18414,13 @@
+ 
+ fi
+ 
+-echo "$as_me:18413: checking for getenv" >&5
++echo "$as_me:18417: checking for getenv" >&5
+ echo $ECHO_N "checking for getenv... $ECHO_C" >&6
+ if test "${ac_cv_func_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18419 "configure"
++#line 18423 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18447,16 +18451,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18450: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18454: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18453: \$? = $ac_status" >&5
++  echo "$as_me:18457: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18456: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18460: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18459: \$? = $ac_status" >&5
++  echo "$as_me:18463: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -18466,19 +18470,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18469: result: $ac_cv_func_getenv" >&5
++echo "$as_me:18473: result: $ac_cv_func_getenv" >&5
+ echo "${ECHO_T}$ac_cv_func_getenv" >&6
+ 
+ for ac_func in putenv setenv strdup
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18475: checking for $ac_func" >&5
++echo "$as_me:18479: 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 18481 "configure"
++#line 18485 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18509,16 +18513,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18516: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18515: \$? = $ac_status" >&5
++  echo "$as_me:18519: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18521: \$? = $ac_status" >&5
++  echo "$as_me:18525: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18528,7 +18532,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18531: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18535: 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 <&5
++echo "$as_me:18545: checking if getenv returns consistent values" >&5
+ echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
+ if test "${cf_cv_consistent_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18548,7 +18552,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18551 "configure"
++#line 18555 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18657,15 +18661,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18660: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18664: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18663: \$? = $ac_status" >&5
++  echo "$as_me:18667: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18668: \$? = $ac_status" >&5
++  echo "$as_me:18672: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -18678,7 +18682,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:18681: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:18685: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -18693,7 +18697,7 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:18696: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:18700: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+ echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
+ fi
+ 
+@@ -18701,7 +18705,7 @@
+ # Note: even non-Posix ISC needs  to declare fd_set
+ if test "x$ISC" = xyes ; then
+ 
+-echo "$as_me:18704: checking for main in -lcposix" >&5
++echo "$as_me:18708: 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
+@@ -18709,7 +18713,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18712 "configure"
++#line 18716 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18721,16 +18725,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18724: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18728: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18727: \$? = $ac_status" >&5
++  echo "$as_me:18731: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18734: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18733: \$? = $ac_status" >&5
++  echo "$as_me:18737: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cposix_main=yes
+ else
+@@ -18741,7 +18745,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18744: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:18748: 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 <&5
++	echo "$as_me:18759: 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
+@@ -18760,7 +18764,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18763 "configure"
++#line 18767 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18779,16 +18783,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18782: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18786: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18785: \$? = $ac_status" >&5
++  echo "$as_me:18789: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18792: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18791: \$? = $ac_status" >&5
++  echo "$as_me:18795: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_inet_bzero=yes
+ else
+@@ -18799,7 +18803,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18802: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:18806: 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
+ 
+@@ -18822,14 +18826,14 @@
+ fi
+ fi
+ 
+-echo "$as_me:18825: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:18829: 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 18832 "configure"
++#line 18836 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18849,16 +18853,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18852: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18856: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18855: \$? = $ac_status" >&5
++  echo "$as_me:18859: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18858: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18862: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18861: \$? = $ac_status" >&5
++  echo "$as_me:18865: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -18870,7 +18874,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18873: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:18877: 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
+@@ -18885,13 +18889,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:18888: checking for an ANSI C-conforming const" >&5
++echo "$as_me:18892: 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 18894 "configure"
++#line 18898 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18949,16 +18953,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18952: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18956: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18955: \$? = $ac_status" >&5
++  echo "$as_me:18959: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18958: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18962: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18961: \$? = $ac_status" >&5
++  echo "$as_me:18965: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -18968,7 +18972,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:18971: result: $ac_cv_c_const" >&5
++echo "$as_me:18975: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -18978,7 +18982,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18981: checking for inline" >&5
++echo "$as_me:18985: 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
+@@ -18986,7 +18990,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18989 "configure"
++#line 18993 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -18995,16 +18999,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18998: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19002: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19001: \$? = $ac_status" >&5
++  echo "$as_me:19005: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19008: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19007: \$? = $ac_status" >&5
++  echo "$as_me:19011: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -19015,7 +19019,7 @@
+ done
+ 
+ fi
+-echo "$as_me:19018: result: $ac_cv_c_inline" >&5
++echo "$as_me:19022: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -19041,7 +19045,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:19044: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:19048: checking if $CC supports options to tune inlining" >&5
+ echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
+ if test "${cf_cv_gcc_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19050,7 +19054,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 19053 "configure"
++#line 19057 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -19062,16 +19066,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19065: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19069: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19068: \$? = $ac_status" >&5
++  echo "$as_me:19072: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19075: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19074: \$? = $ac_status" >&5
++  echo "$as_me:19078: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -19083,7 +19087,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:19086: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:19090: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -19189,7 +19193,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:19192: checking for signal global datatype" >&5
++echo "$as_me:19196: 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
+@@ -19201,7 +19205,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19204 "configure"
++#line 19208 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19224,16 +19228,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19231: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19230: \$? = $ac_status" >&5
++  echo "$as_me:19234: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19237: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19236: \$? = $ac_status" >&5
++  echo "$as_me:19240: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -19247,7 +19251,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19250: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:19254: 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 <&5
++echo "$as_me:19263: 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
+@@ -19266,7 +19270,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19269 "configure"
++#line 19273 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -19301,15 +19305,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19304: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19308: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19307: \$? = $ac_status" >&5
++  echo "$as_me:19311: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19309: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19313: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19312: \$? = $ac_status" >&5
++  echo "$as_me:19316: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -19324,7 +19328,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19327: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:19331: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:19343: 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 19346 "configure"
++#line 19350 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -19355,16 +19359,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19358: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19362: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19361: \$? = $ac_status" >&5
++  echo "$as_me:19365: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19364: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19367: \$? = $ac_status" >&5
++  echo "$as_me:19371: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -19376,7 +19380,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19379: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:19383: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -19392,14 +19396,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:19395: checking if external errno is declared" >&5
++echo "$as_me:19399: 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 19402 "configure"
++#line 19406 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -19417,16 +19421,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19420: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19424: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19423: \$? = $ac_status" >&5
++  echo "$as_me:19427: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19429: \$? = $ac_status" >&5
++  echo "$as_me:19433: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -19437,7 +19441,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19440: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:19444: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -19452,14 +19456,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:19455: checking if external errno exists" >&5
++echo "$as_me:19459: 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 19462 "configure"
++#line 19466 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -19474,16 +19478,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19477: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19481: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19480: \$? = $ac_status" >&5
++  echo "$as_me:19484: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19483: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19487: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19486: \$? = $ac_status" >&5
++  echo "$as_me:19490: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -19494,7 +19498,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19497: result: $cf_cv_have_errno" >&5
++echo "$as_me:19501: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -19507,7 +19511,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19510: checking if data-only library module links" >&5
++echo "$as_me:19514: 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
+@@ -19515,20 +19519,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:19525: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19524: \$? = $ac_status" >&5
++  echo "$as_me:19528: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:19548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19547: \$? = $ac_status" >&5
++  echo "$as_me:19551: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -19557,7 +19561,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19560 "configure"
++#line 19564 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -19568,15 +19572,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19575: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19574: \$? = $ac_status" >&5
++  echo "$as_me:19578: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19580: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19579: \$? = $ac_status" >&5
++  echo "$as_me:19583: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -19591,7 +19595,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19594: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:19598: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -19633,13 +19637,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19636: checking for $ac_func" >&5
++echo "$as_me:19640: 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 19642 "configure"
++#line 19646 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19670,16 +19674,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19673: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19677: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19676: \$? = $ac_status" >&5
++  echo "$as_me:19680: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19679: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19682: \$? = $ac_status" >&5
++  echo "$as_me:19686: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19689,7 +19693,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:19692: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:19696: 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 <&5
++	{ { echo "$as_me:19708: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19710,7 +19714,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:19713: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:19717: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -19723,14 +19727,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:19726: checking for terminal-capability database functions" >&5
++echo "$as_me:19730: 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 19733 "configure"
++#line 19737 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19750,16 +19754,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19753: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19757: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19756: \$? = $ac_status" >&5
++  echo "$as_me:19760: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19759: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19763: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19762: \$? = $ac_status" >&5
++  echo "$as_me:19766: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -19770,7 +19774,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19773: result: $cf_cv_cgetent" >&5
++echo "$as_me:19777: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -19780,14 +19784,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:19783: checking if cgetent uses const parameter" >&5
++echo "$as_me:19787: checking if cgetent uses const parameter" >&5
+ echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
+ if test "${cf_cv_cgetent_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19790 "configure"
++#line 19794 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -19810,16 +19814,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19813: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19817: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19816: \$? = $ac_status" >&5
++  echo "$as_me:19820: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19822: \$? = $ac_status" >&5
++  echo "$as_me:19826: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -19830,7 +19834,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19833: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:19837: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -19844,14 +19848,14 @@
+ 
+ fi
+ 
+-echo "$as_me:19847: checking for isascii" >&5
++echo "$as_me:19851: 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 19854 "configure"
++#line 19858 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -19863,16 +19867,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19866: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19870: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19869: \$? = $ac_status" >&5
++  echo "$as_me:19873: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19876: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19875: \$? = $ac_status" >&5
++  echo "$as_me:19879: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -19883,7 +19887,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19886: result: $cf_cv_have_isascii" >&5
++echo "$as_me:19890: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -19891,10 +19895,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:19894: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:19898: 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 19897 "configure"
++#line 19901 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19908,16 +19912,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19915: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19914: \$? = $ac_status" >&5
++  echo "$as_me:19918: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19921: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19920: \$? = $ac_status" >&5
++  echo "$as_me:19924: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=no
+ else
+@@ -19925,7 +19929,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19928 "configure"
++#line 19932 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -19940,16 +19944,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19943: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19947: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19946: \$? = $ac_status" >&5
++  echo "$as_me:19950: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19953: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19952: \$? = $ac_status" >&5
++  echo "$as_me:19956: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=yes
+ 
+@@ -19965,11 +19969,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19968: result: $sigact_bad" >&5
++echo "$as_me:19972: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:19972: checking if nanosleep really works" >&5
++echo "$as_me:19976: 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
+@@ -19979,7 +19983,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19982 "configure"
++#line 19986 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20004,15 +20008,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20007: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20011: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20010: \$? = $ac_status" >&5
++  echo "$as_me:20014: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20015: \$? = $ac_status" >&5
++  echo "$as_me:20019: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -20024,7 +20028,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:20027: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:20031: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -20041,23 +20045,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20044: checking for $ac_header" >&5
++echo "$as_me:20048: 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 20050 "configure"
++#line 20054 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20054: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20058: \"$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:20060: \$? = $ac_status" >&5
++  echo "$as_me:20064: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20076,7 +20080,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20079: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20083: 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 <&5
++	echo "$as_me:20100: 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 20099 "configure"
++#line 20103 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -20108,16 +20112,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20111: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20115: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20114: \$? = $ac_status" >&5
++  echo "$as_me:20118: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20121: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20120: \$? = $ac_status" >&5
++  echo "$as_me:20124: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=no
+ else
+@@ -20125,7 +20129,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 20128 "configure"
++#line 20132 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -20139,16 +20143,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20142: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20146: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20145: \$? = $ac_status" >&5
++  echo "$as_me:20149: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20148: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20151: \$? = $ac_status" >&5
++  echo "$as_me:20155: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=unknown
+ else
+@@ -20164,19 +20168,19 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:20167: result: $termios_bad" >&5
++	echo "$as_me:20171: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:20172: checking for tcgetattr" >&5
++echo "$as_me:20176: 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 20179 "configure"
++#line 20183 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20204,16 +20208,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20207: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20211: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20210: \$? = $ac_status" >&5
++  echo "$as_me:20214: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20216: \$? = $ac_status" >&5
++  echo "$as_me:20220: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -20223,21 +20227,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20226: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:20230: 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:20233: checking for vsscanf function or workaround" >&5
++echo "$as_me:20237: 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 20240 "configure"
++#line 20244 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20253,16 +20257,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20256: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20260: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20259: \$? = $ac_status" >&5
++  echo "$as_me:20263: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20266: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20265: \$? = $ac_status" >&5
++  echo "$as_me:20269: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -20270,7 +20274,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20273 "configure"
++#line 20277 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20292,16 +20296,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20295: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20299: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20298: \$? = $ac_status" >&5
++  echo "$as_me:20302: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20301: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20305: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20304: \$? = $ac_status" >&5
++  echo "$as_me:20308: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -20309,7 +20313,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20312 "configure"
++#line 20316 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20331,16 +20335,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20334: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20338: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20337: \$? = $ac_status" >&5
++  echo "$as_me:20341: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20343: \$? = $ac_status" >&5
++  echo "$as_me:20347: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -20355,7 +20359,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20358: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:20362: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case $cf_cv_func_vsscanf in
+@@ -20381,23 +20385,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20384: checking for $ac_header" >&5
++echo "$as_me:20388: 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 20390 "configure"
++#line 20394 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20394: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20398: \"$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:20400: \$? = $ac_status" >&5
++  echo "$as_me:20404: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20416,7 +20420,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20419: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20423: 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 <&5
++echo "$as_me:20433: 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
+@@ -20437,7 +20441,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20440 "configure"
++#line 20444 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20478,15 +20482,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20481: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20485: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20484: \$? = $ac_status" >&5
++  echo "$as_me:20488: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20490: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20489: \$? = $ac_status" >&5
++  echo "$as_me:20493: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -20501,16 +20505,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:20504: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:20508: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:20507: checking for mkstemp" >&5
++	echo "$as_me:20511: 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 20513 "configure"
++#line 20517 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20541,16 +20545,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20544: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20548: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20547: \$? = $ac_status" >&5
++  echo "$as_me:20551: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20550: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20553: \$? = $ac_status" >&5
++  echo "$as_me:20557: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -20560,7 +20564,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20563: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:20567: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -20581,21 +20585,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:20584: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:20588: 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:20587: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:20591: 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:20593: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:20597: 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 20598 "configure"
++#line 20602 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -20612,15 +20616,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20615: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20619: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20618: \$? = $ac_status" >&5
++  echo "$as_me:20622: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20620: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20624: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20623: \$? = $ac_status" >&5
++  echo "$as_me:20627: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -20633,7 +20637,7 @@
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:20636: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:20640: 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
+ 
+@@ -20644,13 +20648,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:20647: checking for intptr_t" >&5
++echo "$as_me:20651: checking for intptr_t" >&5
+ echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
+ if test "${ac_cv_type_intptr_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20653 "configure"
++#line 20657 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -20665,16 +20669,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20668: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20672: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20671: \$? = $ac_status" >&5
++  echo "$as_me:20675: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20674: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20678: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20677: \$? = $ac_status" >&5
++  echo "$as_me:20681: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -20684,7 +20688,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:20687: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:20691: result: $ac_cv_type_intptr_t" >&5
+ echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
+ if test $ac_cv_type_intptr_t = yes; then
+   :
+@@ -20696,13 +20700,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20699: checking for ssize_t" >&5
++echo "$as_me:20703: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20705 "configure"
++#line 20709 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -20717,16 +20721,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20720: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20724: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20723: \$? = $ac_status" >&5
++  echo "$as_me:20727: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20726: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20730: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20729: \$? = $ac_status" >&5
++  echo "$as_me:20733: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -20736,7 +20740,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:20739: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:20743: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test $ac_cv_type_ssize_t = yes; then
+   :
+@@ -20748,14 +20752,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20751: checking for type sigaction_t" >&5
++echo "$as_me:20755: 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 20758 "configure"
++#line 20762 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20768,16 +20772,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20775: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20774: \$? = $ac_status" >&5
++  echo "$as_me:20778: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20781: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20780: \$? = $ac_status" >&5
++  echo "$as_me:20784: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -20788,14 +20792,14 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:20791: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:20795: 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:20798: checking declaration of size-change" >&5
++echo "$as_me:20802: 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
+@@ -20816,7 +20820,7 @@
+ 
+ 	fi
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20819 "configure"
++#line 20823 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -20862,16 +20866,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20865: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20869: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20868: \$? = $ac_status" >&5
++  echo "$as_me:20872: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20875: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20874: \$? = $ac_status" >&5
++  echo "$as_me:20878: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -20890,7 +20894,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20893: result: $cf_cv_sizechange" >&5
++echo "$as_me:20897: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -20908,13 +20912,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:20911: checking for memmove" >&5
++echo "$as_me:20915: 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 20917 "configure"
++#line 20921 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20945,16 +20949,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20948: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20952: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20951: \$? = $ac_status" >&5
++  echo "$as_me:20955: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20954: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20958: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20957: \$? = $ac_status" >&5
++  echo "$as_me:20961: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -20964,19 +20968,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20967: result: $ac_cv_func_memmove" >&5
++echo "$as_me:20971: 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:20973: checking for bcopy" >&5
++echo "$as_me:20977: 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 20979 "configure"
++#line 20983 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21007,16 +21011,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21014: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21013: \$? = $ac_status" >&5
++  echo "$as_me:21017: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21019: \$? = $ac_status" >&5
++  echo "$as_me:21023: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -21026,11 +21030,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21029: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:21033: 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:21033: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:21037: 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
+@@ -21040,7 +21044,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21043 "configure"
++#line 21047 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -21054,15 +21058,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21060: \$? = $ac_status" >&5
++  echo "$as_me:21064: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21062: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21065: \$? = $ac_status" >&5
++  echo "$as_me:21069: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -21075,7 +21079,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21078: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:21082: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -21102,13 +21106,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:21105: checking for $ac_func" >&5
++echo "$as_me:21109: 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 21111 "configure"
++#line 21115 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21139,16 +21143,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21142: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21146: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21145: \$? = $ac_status" >&5
++  echo "$as_me:21149: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21148: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21151: \$? = $ac_status" >&5
++  echo "$as_me:21155: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21158,7 +21162,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21161: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:21165: 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 <&5
++echo "$as_me:21175: 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
+@@ -21178,7 +21182,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21181 "configure"
++#line 21185 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21230,15 +21234,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21233: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21237: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21236: \$? = $ac_status" >&5
++  echo "$as_me:21240: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21238: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21242: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21241: \$? = $ac_status" >&5
++  echo "$as_me:21245: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -21250,21 +21254,21 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21253: result: $cf_cv_working_poll" >&5
++echo "$as_me:21257: result: $cf_cv_working_poll" >&5
+ echo "${ECHO_T}$cf_cv_working_poll" >&6
+ test "$cf_cv_working_poll" = "yes" &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_WORKING_POLL 1
+ EOF
+ 
+-echo "$as_me:21260: checking for va_copy" >&5
++echo "$as_me:21264: checking for va_copy" >&5
+ echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21267 "configure"
++#line 21271 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21281,16 +21285,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21284: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21288: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21287: \$? = $ac_status" >&5
++  echo "$as_me:21291: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21290: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21293: \$? = $ac_status" >&5
++  echo "$as_me:21297: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -21300,7 +21304,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21303: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:21307: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -21312,14 +21316,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:21315: checking for __va_copy" >&5
++echo "$as_me:21319: checking for __va_copy" >&5
+ echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21322 "configure"
++#line 21326 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21336,16 +21340,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21343: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21342: \$? = $ac_status" >&5
++  echo "$as_me:21346: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21348: \$? = $ac_status" >&5
++  echo "$as_me:21352: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -21355,7 +21359,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21358: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:21362: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -21367,14 +21371,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:21370: checking for __builtin_va_copy" >&5
++echo "$as_me:21374: checking for __builtin_va_copy" >&5
+ echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___builtin_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21377 "configure"
++#line 21381 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21391,16 +21395,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21394: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21398: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21397: \$? = $ac_status" >&5
++  echo "$as_me:21401: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21403: \$? = $ac_status" >&5
++  echo "$as_me:21407: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -21410,7 +21414,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21413: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:21417: result: $cf_cv_have___builtin_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
+ 
+ test "$cf_cv_have___builtin_va_copy" = yes &&
+@@ -21428,14 +21432,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:21431: checking if we can simply copy va_list" >&5
++	echo "$as_me:21435: checking if we can simply copy va_list" >&5
+ echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
+ if test "${cf_cv_pointer_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21438 "configure"
++#line 21442 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21452,16 +21456,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21455: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21459: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21458: \$? = $ac_status" >&5
++  echo "$as_me:21462: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21461: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21464: \$? = $ac_status" >&5
++  echo "$as_me:21468: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -21471,19 +21475,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21474: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:21478: result: $cf_cv_pointer_va_list" >&5
+ echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
+ 
+ 	if test "$cf_cv_pointer_va_list" = no
+ 	then
+-		echo "$as_me:21479: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:21483: checking if we can copy va_list indirectly" >&5
+ echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
+ if test "${cf_cv_array_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21486 "configure"
++#line 21490 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21500,16 +21504,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21503: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21507: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21506: \$? = $ac_status" >&5
++  echo "$as_me:21510: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21509: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21513: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21512: \$? = $ac_status" >&5
++  echo "$as_me:21516: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -21519,7 +21523,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21522: result: $cf_cv_array_va_list" >&5
++echo "$as_me:21526: result: $cf_cv_array_va_list" >&5
+ echo "${ECHO_T}$cf_cv_array_va_list" >&6
+ 		test "$cf_cv_array_va_list" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21530,13 +21534,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:21533: checking for pid_t" >&5
++echo "$as_me:21537: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21539 "configure"
++#line 21543 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21551,16 +21555,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21554: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21558: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21557: \$? = $ac_status" >&5
++  echo "$as_me:21561: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21563: \$? = $ac_status" >&5
++  echo "$as_me:21567: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -21570,7 +21574,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:21573: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:21577: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+   :
+@@ -21585,23 +21589,23 @@
+ for ac_header in unistd.h vfork.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:21588: checking for $ac_header" >&5
++echo "$as_me:21592: 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 21594 "configure"
++#line 21598 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:21598: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:21602: \"$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:21604: \$? = $ac_status" >&5
++  echo "$as_me:21608: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21620,7 +21624,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:21623: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:21627: 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 <&5
++echo "$as_me:21640: 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 21642 "configure"
++#line 21646 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21670,16 +21674,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21673: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21677: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21676: \$? = $ac_status" >&5
++  echo "$as_me:21680: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21679: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21682: \$? = $ac_status" >&5
++  echo "$as_me:21686: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21689,7 +21693,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21692: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:21696: 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 <&5
++  echo "$as_me:21708: checking for working fork" >&5
+ echo $ECHO_N "checking for working fork... $ECHO_C" >&6
+ if test "${ac_cv_func_fork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21724,15 +21728,15 @@
+       }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21727: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21731: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21730: \$? = $ac_status" >&5
++  echo "$as_me:21734: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21732: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21736: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21735: \$? = $ac_status" >&5
++  echo "$as_me:21739: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -21744,7 +21748,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21747: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:21751: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -21758,12 +21762,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:21761: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:21765: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
+ fi
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ if test "x$ac_cv_func_vfork" = xyes; then
+-  echo "$as_me:21766: checking for working vfork" >&5
++  echo "$as_me:21770: checking for working vfork" >&5
+ echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
+ if test "${ac_cv_func_vfork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21772,7 +21776,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21775 "configure"
++#line 21779 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -21869,15 +21873,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21872: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21876: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21875: \$? = $ac_status" >&5
++  echo "$as_me:21879: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21877: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21881: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21880: \$? = $ac_status" >&5
++  echo "$as_me:21884: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -21889,13 +21893,13 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21892: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:21896: result: $ac_cv_func_vfork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+ 
+ fi;
+ if test "x$ac_cv_func_fork_works" = xcross; then
+   ac_cv_func_vfork_works=ac_cv_func_vfork
+-  { echo "$as_me:21898: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:21902: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
+ fi
+ 
+@@ -21920,7 +21924,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21923: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:21927: checking if fopen accepts explicit binary mode" >&5
+ echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
+ if test "${cf_cv_fopen_bin_r+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21930,7 +21934,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21933 "configure"
++#line 21937 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21963,15 +21967,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21966: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21970: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21969: \$? = $ac_status" >&5
++  echo "$as_me:21973: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21971: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21974: \$? = $ac_status" >&5
++  echo "$as_me:21978: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -21984,7 +21988,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21987: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:21991: result: $cf_cv_fopen_bin_r" >&5
+ echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
+ test "x$cf_cv_fopen_bin_r" != xno &&
+ cat >>confdefs.h <<\EOF
+@@ -21993,7 +21997,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:21996: checking for openpty in -lutil" >&5
++echo "$as_me:22000: 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
+@@ -22001,7 +22005,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 22004 "configure"
++#line 22008 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22020,16 +22024,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22023: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22027: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22026: \$? = $ac_status" >&5
++  echo "$as_me:22030: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22033: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22032: \$? = $ac_status" >&5
++  echo "$as_me:22036: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -22040,7 +22044,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22043: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:22047: 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
+@@ -22048,7 +22052,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:22051: checking for openpty header" >&5
++echo "$as_me:22055: 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
+@@ -22075,7 +22079,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22078 "configure"
++#line 22082 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -22092,16 +22096,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22095: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22099: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22098: \$? = $ac_status" >&5
++  echo "$as_me:22102: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22105: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22104: \$? = $ac_status" >&5
++  echo "$as_me:22108: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -22119,7 +22123,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:22122: result: $cf_cv_func_openpty" >&5
++echo "$as_me:22126: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -22192,7 +22196,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 22195 "configure"
++#line 22199 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22204,16 +22208,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22207: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22211: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22210: \$? = $ac_status" >&5
++  echo "$as_me:22214: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22216: \$? = $ac_status" >&5
++  echo "$as_me:22220: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -22230,7 +22234,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:22233: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:22237: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -22266,7 +22270,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}:22269: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:22273: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -22277,7 +22281,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:22280: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:22284: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -22349,7 +22353,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 22352 "configure"
++#line 22356 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22361,16 +22365,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22364: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22367: \$? = $ac_status" >&5
++  echo "$as_me:22371: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22370: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22373: \$? = $ac_status" >&5
++  echo "$as_me:22377: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -22387,7 +22391,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:22390: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:22394: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -22467,7 +22471,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}:22470: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:22474: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -22484,23 +22488,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:22487: checking for db.h" >&5
++echo "$as_me:22491: 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 22493 "configure"
++#line 22497 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:22497: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:22501: \"$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:22503: \$? = $ac_status" >&5
++  echo "$as_me:22507: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22519,11 +22523,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:22522: result: $ac_cv_header_db_h" >&5
++echo "$as_me:22526: 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:22526: checking for version of db" >&5
++echo "$as_me:22530: 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
+@@ -22534,10 +22538,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:22537: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:22541: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22540 "configure"
++#line 22544 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22567,16 +22571,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22570: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22574: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22573: \$? = $ac_status" >&5
++  echo "$as_me:22577: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22580: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22579: \$? = $ac_status" >&5
++  echo "$as_me:22583: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -22590,16 +22594,16 @@
+ done
+ 
+ fi
+-echo "$as_me:22593: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:22597: 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:22597: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:22601: 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:22602: checking for db libraries" >&5
++echo "$as_me:22606: 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
+@@ -22629,10 +22633,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:22632: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:22636: testing checking for library "$cf_db_libs" ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22635 "configure"
++#line 22639 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22687,16 +22691,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22690: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22694: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22693: \$? = $ac_status" >&5
++  echo "$as_me:22697: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22699: \$? = $ac_status" >&5
++  echo "$as_me:22703: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -22716,11 +22720,11 @@
+ done
+ 
+ fi
+-echo "$as_me:22719: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:22723: 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:22723: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:22727: 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
+@@ -22746,7 +22750,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:22749: error: Cannot find db.h" >&5
++	{ { echo "$as_me:22753: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -22761,7 +22765,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:22764: checking if we should include stdbool.h" >&5
++echo "$as_me:22768: 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
+@@ -22769,7 +22773,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22772 "configure"
++#line 22776 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -22781,23 +22785,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22784: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22788: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22787: \$? = $ac_status" >&5
++  echo "$as_me:22791: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22790: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22793: \$? = $ac_status" >&5
++  echo "$as_me:22797: \$? = $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 22800 "configure"
++#line 22804 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -22813,16 +22817,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22816: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22820: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22819: \$? = $ac_status" >&5
++  echo "$as_me:22823: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22826: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22825: \$? = $ac_status" >&5
++  echo "$as_me:22829: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -22836,13 +22840,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:22839: result: yes" >&5
++then	echo "$as_me:22843: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22841: result: no" >&5
++else	echo "$as_me:22845: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:22845: checking for builtin bool type" >&5
++echo "$as_me:22849: 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
+@@ -22850,7 +22854,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22853 "configure"
++#line 22857 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22865,16 +22869,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22868: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22872: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22871: \$? = $ac_status" >&5
++  echo "$as_me:22875: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22874: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22878: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22877: \$? = $ac_status" >&5
++  echo "$as_me:22881: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -22887,9 +22891,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:22890: result: yes" >&5
++then	echo "$as_me:22894: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22892: result: no" >&5
++else	echo "$as_me:22896: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -22906,10 +22910,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:22909: checking if we already have C++ library" >&5
++	echo "$as_me:22913: checking if we already have C++ library" >&5
+ echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22912 "configure"
++#line 22916 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -22923,16 +22927,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22926: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22930: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22929: \$? = $ac_status" >&5
++  echo "$as_me:22933: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22932: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22935: \$? = $ac_status" >&5
++  echo "$as_me:22939: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -22941,7 +22945,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-	echo "$as_me:22944: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:22948: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -22960,7 +22964,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:22963: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:22967: 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
+@@ -22986,7 +22990,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 22989 "configure"
++#line 22993 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -23000,16 +23004,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:23003: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23007: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23006: \$? = $ac_status" >&5
++  echo "$as_me:23010: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:23009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23012: \$? = $ac_status" >&5
++  echo "$as_me:23016: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -23021,7 +23025,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:23024: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:23028: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -23043,7 +23047,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:23046: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:23050: 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
+@@ -23058,15 +23062,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 $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:23061: \"$ac_try\"") >&5
++if { (eval echo "$as_me:23065: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23064: \$? = $ac_status" >&5
++  echo "$as_me:23068: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:23066: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:23070: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23069: \$? = $ac_status" >&5
++  echo "$as_me:23073: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -23077,10 +23081,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+-  echo "$as_me:23080: result: yes" >&5
++  echo "$as_me:23084: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:23083: result: no" >&5
++  echo "$as_me:23087: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23100,7 +23104,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:23103: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:23107: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -23121,7 +23125,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23124 "configure"
++#line 23128 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -23135,16 +23139,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:23138: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23142: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23141: \$? = $ac_status" >&5
++  echo "$as_me:23145: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:23144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23148: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23147: \$? = $ac_status" >&5
++  echo "$as_me:23151: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -23181,7 +23185,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 23184 "configure"
++#line 23188 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23195,16 +23199,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:23198: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23202: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23201: \$? = $ac_status" >&5
++  echo "$as_me:23205: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:23204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23208: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23207: \$? = $ac_status" >&5
++  echo "$as_me:23211: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -23237,7 +23241,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save"
+-	echo "$as_me:23240: result: $cf_cxx_library" >&5
++	echo "$as_me:23244: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -23253,7 +23257,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:23256: checking how to run the C++ preprocessor" >&5
++echo "$as_me:23260: 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
+@@ -23270,18 +23274,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 23273 "configure"
++#line 23277 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:23278: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23282: \"$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:23284: \$? = $ac_status" >&5
++  echo "$as_me:23288: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23304,17 +23308,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23307 "configure"
++#line 23311 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23311: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23315: \"$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:23317: \$? = $ac_status" >&5
++  echo "$as_me:23321: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23351,7 +23355,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:23354: result: $CXXCPP" >&5
++echo "$as_me:23358: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -23361,18 +23365,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 23364 "configure"
++#line 23368 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:23369: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23373: \"$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:23375: \$? = $ac_status" >&5
++  echo "$as_me:23379: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23395,17 +23399,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23398 "configure"
++#line 23402 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23402: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23406: \"$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:23408: \$? = $ac_status" >&5
++  echo "$as_me:23412: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23433,7 +23437,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:23436: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:23440: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -23448,23 +23452,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23451: checking for $ac_header" >&5
++echo "$as_me:23455: 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 23457 "configure"
++#line 23461 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23461: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23465: \"$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:23467: \$? = $ac_status" >&5
++  echo "$as_me:23471: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23483,7 +23487,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:23486: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:23490: 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 <&5
++echo "$as_me:23503: 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 23505 "configure"
++#line 23509 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23509: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23513: \"$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:23515: \$? = $ac_status" >&5
++  echo "$as_me:23519: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23531,7 +23535,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:23534: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:23538: 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 <&5
++	echo "$as_me:23549: 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 23548 "configure"
++#line 23552 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23562,16 +23566,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23565: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23569: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23568: \$? = $ac_status" >&5
++  echo "$as_me:23572: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23571: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23575: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23574: \$? = $ac_status" >&5
++  echo "$as_me:23578: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -23580,7 +23584,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:23583: result: $cf_iostream_namespace" >&5
++	echo "$as_me:23587: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -23591,7 +23595,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:23594: checking if we should include stdbool.h" >&5
++echo "$as_me:23598: 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
+@@ -23599,7 +23603,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23602 "configure"
++#line 23606 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23611,23 +23615,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23614: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23618: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23617: \$? = $ac_status" >&5
++  echo "$as_me:23621: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23620: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23624: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23623: \$? = $ac_status" >&5
++  echo "$as_me:23627: \$? = $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 23630 "configure"
++#line 23634 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -23643,16 +23647,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23650: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23649: \$? = $ac_status" >&5
++  echo "$as_me:23653: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23656: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23655: \$? = $ac_status" >&5
++  echo "$as_me:23659: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -23666,13 +23670,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:23669: result: yes" >&5
++then	echo "$as_me:23673: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:23671: result: no" >&5
++else	echo "$as_me:23675: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:23675: checking for builtin bool type" >&5
++echo "$as_me:23679: 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
+@@ -23680,7 +23684,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23683 "configure"
++#line 23687 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23695,16 +23699,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23698: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23702: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23701: \$? = $ac_status" >&5
++  echo "$as_me:23705: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23704: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23708: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23707: \$? = $ac_status" >&5
++  echo "$as_me:23711: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -23717,13 +23721,13 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:23720: result: yes" >&5
++then	echo "$as_me:23724: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:23722: result: no" >&5
++else	echo "$as_me:23726: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:23726: checking for size of bool" >&5
++echo "$as_me:23730: 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
+@@ -23734,7 +23738,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23737 "configure"
++#line 23741 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23776,15 +23780,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23779: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23782: \$? = $ac_status" >&5
++  echo "$as_me:23786: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23784: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23787: \$? = $ac_status" >&5
++  echo "$as_me:23791: \$? = $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
+@@ -23802,18 +23806,18 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:23805: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:23809: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:23811: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:23815: 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:23816: checking for special defines needed for etip.h" >&5
++echo "$as_me:23820: 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"
+@@ -23831,7 +23835,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 23834 "configure"
++#line 23838 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23845,16 +23849,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23852: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23851: \$? = $ac_status" >&5
++  echo "$as_me:23855: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23858: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23857: \$? = $ac_status" >&5
++  echo "$as_me:23861: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:23882: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:23883: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:23887: 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
+@@ -23897,7 +23901,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23900 "configure"
++#line 23904 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -23916,15 +23920,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23919: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23923: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23922: \$? = $ac_status" >&5
++  echo "$as_me:23926: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23928: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23927: \$? = $ac_status" >&5
++  echo "$as_me:23931: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -23943,7 +23947,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:23946: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:23950: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -23953,7 +23957,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:23956: checking if $CXX accepts static_cast" >&5
++echo "$as_me:23960: 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
+@@ -23967,7 +23971,7 @@
+ ac_main_return=return
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23970 "configure"
++#line 23974 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -24011,16 +24015,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24018: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24017: \$? = $ac_status" >&5
++  echo "$as_me:24021: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24023: \$? = $ac_status" >&5
++  echo "$as_me:24027: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -24038,7 +24042,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:24041: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:24045: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -24087,7 +24091,7 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:24090: checking for size of bool" >&5
++echo "$as_me:24094: 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
+@@ -24098,7 +24102,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 24101 "configure"
++#line 24105 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24140,15 +24144,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:24143: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24147: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24146: \$? = $ac_status" >&5
++  echo "$as_me:24150: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:24148: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24151: \$? = $ac_status" >&5
++  echo "$as_me:24155: \$? = $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
+@@ -24166,25 +24170,25 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:24169: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:24173: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:24175: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:24179: 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:24181: checking for fallback type of bool" >&5
++			echo "$as_me:24185: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ 			case "$host_cpu" in
+ 			(i?86)	cf_cv_type_of_bool=char	;;
+ 			(*)	cf_cv_type_of_bool=int	;;
+ 			esac
+-			echo "$as_me:24187: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:24191: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -24213,7 +24217,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:24216: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:24220: 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
+@@ -24230,7 +24234,7 @@
+ 	unset cf_TEMP_gnat
+ 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:24233: checking for $ac_word" >&5
++echo "$as_me:24237: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24247,7 +24251,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+-   echo "$as_me:24250: found $ac_dir/$ac_word" >&5
++   echo "$as_me:24254: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -24259,10 +24263,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:24262: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:24266: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:24265: result: no" >&5
++  echo "$as_me:24269: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24272,7 +24276,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:24275: checking for $cf_prog_gnat version" >&5
++echo "$as_me:24279: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24283,7 +24287,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:24286: result: $cf_cv_gnat_version" >&5
++echo "$as_me:24290: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -24312,7 +24316,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:24315: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:24319: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test $cf_gprconfig = C
+ 				then
+@@ -24331,10 +24335,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
+-					echo "$as_me:24334: result: $cf_gprconfig_value" >&5
++					echo "$as_me:24338: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:24337: result: missing" >&5
++					echo "$as_me:24341: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -24347,7 +24351,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:24350: checking for gnat version" >&5
++echo "$as_me:24354: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24358,7 +24362,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:24361: result: $cf_cv_gnat_version" >&5
++echo "$as_me:24365: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ 
+@@ -24367,7 +24371,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:24370: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:24374: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -24375,7 +24379,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:24378: checking for $ac_word" >&5
++echo "$as_me:24382: 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
+@@ -24390,7 +24394,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:24393: found $ac_dir/$ac_word" >&5
++echo "$as_me:24397: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -24399,20 +24403,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:24402: result: $M4_exists" >&5
++  echo "$as_me:24406: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:24405: result: no" >&5
++  echo "$as_me:24409: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$ac_cv_prog_M4_exists" = no; then
+ 			cf_cv_prog_gnat_correct=no
+-			{ echo "$as_me:24411: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:24415: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ 		fi
+ 		if test "$cf_cv_prog_gnat_correct" = yes; then
+-			echo "$as_me:24415: checking if GNAT works" >&5
++			echo "$as_me:24419: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf conftest* *~conftest*
+@@ -24440,7 +24444,7 @@
+ fi
+ rm -rf conftest* *~conftest*
+ 
+-			echo "$as_me:24443: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:24447: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -24452,7 +24456,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:24455: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:24459: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -24469,10 +24473,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:24472: result: $ADAFLAGS" >&5
++	echo "$as_me:24476: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:24475: checking if GNATPREP supports -T option" >&5
++echo "$as_me:24479: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24482,11 +24486,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:24485: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:24489: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:24489: checking if GNAT supports generics" >&5
++echo "$as_me:24493: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case $cf_cv_gnat_version in
+ (3.[1-9]*|[4-9].*)
+@@ -24496,7 +24500,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:24499: result: $cf_gnat_generics" >&5
++echo "$as_me:24503: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -24508,7 +24512,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:24511: checking if GNAT supports SIGINT" >&5
++echo "$as_me:24515: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24556,7 +24560,7 @@
+ rm -rf conftest* *~conftest*
+ 
+ fi
+-echo "$as_me:24559: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:24563: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -24569,7 +24573,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:24572: checking if GNAT supports project files" >&5
++echo "$as_me:24576: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case $cf_cv_gnat_version in
+ (3.[0-9]*)
+@@ -24632,15 +24636,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:24635: result: $cf_gnat_projects" >&5
++echo "$as_me:24639: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test $cf_gnat_projects = yes
+ then
+-	echo "$as_me:24641: checking if GNAT supports libraries" >&5
++	echo "$as_me:24645: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:24643: result: $cf_gnat_libraries" >&5
++	echo "$as_me:24647: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -24660,7 +24664,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:24663: checking for ada-compiler" >&5
++echo "$as_me:24667: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -24671,12 +24675,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:24674: result: $cf_ada_compiler" >&5
++echo "$as_me:24678: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:24679: checking for ada-include" >&5
++echo "$as_me:24683: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -24712,7 +24716,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:24715: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:24719: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -24721,10 +24725,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:24724: result: $ADA_INCLUDE" >&5
++echo "$as_me:24728: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:24727: checking for ada-objects" >&5
++echo "$as_me:24731: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -24760,7 +24764,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:24763: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:24767: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -24769,10 +24773,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:24772: result: $ADA_OBJECTS" >&5
++echo "$as_me:24776: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:24775: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:24779: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -24782,14 +24786,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:24785: result: $with_ada_sharedlib" >&5
++echo "$as_me:24789: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:24792: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:24796: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -24809,7 +24813,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:24812: checking for ada-libname" >&5
++echo "$as_me:24816: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -24825,7 +24829,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24828: result: $ADA_LIBNAME" >&5
++echo "$as_me:24832: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -24836,13 +24840,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:24839: checking for wchar_t" >&5
++	echo "$as_me:24843: checking for wchar_t" >&5
+ echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_type_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 24845 "configure"
++#line 24849 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24857,16 +24861,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24864: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24863: \$? = $ac_status" >&5
++  echo "$as_me:24867: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24869: \$? = $ac_status" >&5
++  echo "$as_me:24873: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -24876,10 +24880,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:24879: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:24883: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:24882: checking size of wchar_t" >&5
++echo "$as_me:24886: checking size of wchar_t" >&5
+ echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24888,7 +24892,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 24891 "configure"
++#line 24895 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24900,21 +24904,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24903: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24907: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24906: \$? = $ac_status" >&5
++  echo "$as_me:24910: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24909: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24913: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24912: \$? = $ac_status" >&5
++  echo "$as_me:24916: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 24917 "configure"
++#line 24921 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24926,16 +24930,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24929: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24933: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24932: \$? = $ac_status" >&5
++  echo "$as_me:24936: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24935: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24939: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24938: \$? = $ac_status" >&5
++  echo "$as_me:24942: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -24951,7 +24955,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 24954 "configure"
++#line 24958 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24963,16 +24967,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24966: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24970: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24969: \$? = $ac_status" >&5
++  echo "$as_me:24973: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24976: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24975: \$? = $ac_status" >&5
++  echo "$as_me:24979: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -24988,7 +24992,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 24991 "configure"
++#line 24995 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -25000,16 +25004,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:25003: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25007: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25006: \$? = $ac_status" >&5
++  echo "$as_me:25010: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:25009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25012: \$? = $ac_status" >&5
++  echo "$as_me:25016: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -25022,12 +25026,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:25025: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:25029: 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 25030 "configure"
++#line 25034 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -25043,15 +25047,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:25046: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25050: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25049: \$? = $ac_status" >&5
++  echo "$as_me:25053: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:25051: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25055: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25054: \$? = $ac_status" >&5
++  echo "$as_me:25058: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -25067,7 +25071,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:25070: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:25074: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:25083: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:25087: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -25098,7 +25102,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:25101: checking for library subsets" >&5
++echo "$as_me:25105: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -25140,7 +25144,7 @@
+ test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+ 
+-echo "$as_me:25143: result: $LIB_SUBSETS" >&5
++echo "$as_me:25147: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -25171,7 +25175,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:25174: checking default library suffix" >&5
++echo "$as_me:25178: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -25182,10 +25186,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:25185: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:25189: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:25188: checking default library-dependency suffix" >&5
++echo "$as_me:25192: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -25243,10 +25247,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:25246: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:25250: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:25249: checking default object directory" >&5
++echo "$as_me:25253: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -25262,11 +25266,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:25265: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:25269: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:25269: checking c++ library-dependency suffix" >&5
++echo "$as_me:25273: checking c++ library-dependency suffix" >&5
+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
+ if test "$with_libtool" != "no"; then
+ 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
+@@ -25334,7 +25338,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:25337: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:25341: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -25510,19 +25514,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:25513: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:25517: checking if linker supports switching between static/dynamic" >&5
+ echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
+ 
+ 	rm -f libconftest.a
+ 	cat >conftest.$ac_ext <
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:25522: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:25526: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25525: \$? = $ac_status" >&5
++  echo "$as_me:25529: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -25533,10 +25537,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 25536 "configure"
++#line 25540 "configure"
+ #include "confdefs.h"
+ 
+-#line 25539 "configure"
++#line 25543 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -25551,16 +25555,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:25554: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25557: \$? = $ac_status" >&5
++  echo "$as_me:25561: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:25560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25563: \$? = $ac_status" >&5
++  echo "$as_me:25567: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -25583,7 +25587,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:25586: result: $cf_ldflags_static" >&5
++	echo "$as_me:25590: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test $cf_ldflags_static != yes
+@@ -25599,7 +25603,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:25602: checking where we will install curses.h" >&5
++echo "$as_me:25606: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -25609,7 +25613,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:25612: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:25616: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -25617,7 +25621,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:25620: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:25624: 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
+@@ -25632,10 +25636,104 @@
+ #define HAVE_SLK_COLOR 1
+ EOF
+ 
++# pkgsrc uses these
++
++echo "$as_me:25641: checking for desired basename for form library" >&5
++echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
++
++# Check whether --with-form-libname or --without-form-libname was given.
++if test "${with_form_libname+set}" = set; then
++  withval="$with_form_libname"
++  with_lib_basename=$withval
++else
++  with_lib_basename=form
++fi;
++FORM_NAME="$with_lib_basename"
++
++case "x$FORM_NAME" in
++(x|xno|xnone|xyes)
++	FORM_NAME=form
++	;;
++(*)
++	;;
++esac
++
++echo "$as_me:25661: result: $FORM_NAME" >&5
++echo "${ECHO_T}$FORM_NAME" >&6
++
++echo "$as_me:25664: checking for desired basename for menu library" >&5
++echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
++
++# Check whether --with-menu-libname or --without-menu-libname was given.
++if test "${with_menu_libname+set}" = set; then
++  withval="$with_menu_libname"
++  with_lib_basename=$withval
++else
++  with_lib_basename=menu
++fi;
++MENU_NAME="$with_lib_basename"
++
++case "x$MENU_NAME" in
++(x|xno|xnone|xyes)
++	MENU_NAME=menu
++	;;
++(*)
++	;;
++esac
++
++echo "$as_me:25684: result: $MENU_NAME" >&5
++echo "${ECHO_T}$MENU_NAME" >&6
++
++echo "$as_me:25687: checking for desired basename for panel library" >&5
++echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
++
++# Check whether --with-panel-libname or --without-panel-libname was given.
++if test "${with_panel_libname+set}" = set; then
++  withval="$with_panel_libname"
++  with_lib_basename=$withval
++else
++  with_lib_basename=panel
++fi;
++PANEL_NAME="$with_lib_basename"
++
++case "x$PANEL_NAME" in
++(x|xno|xnone|xyes)
++	PANEL_NAME=panel
++	;;
++(*)
++	;;
++esac
++
++echo "$as_me:25707: result: $PANEL_NAME" >&5
++echo "${ECHO_T}$PANEL_NAME" >&6
++
++echo "$as_me:25710: checking for desired basename for cxx library" >&5
++echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
++
++# Check whether --with-cxx-libname or --without-cxx-libname was given.
++if test "${with_cxx_libname+set}" = set; then
++  withval="$with_cxx_libname"
++  with_lib_basename=$withval
++else
++  with_lib_basename=ncurses++
++fi;
++CXX_NAME="$with_lib_basename"
++
++case "x$CXX_NAME" in
++(x|xno|xnone|xyes)
++	CXX_NAME=ncurses++
++	;;
++(*)
++	;;
++esac
++
++echo "$as_me:25730: result: $CXX_NAME" >&5
++echo "${ECHO_T}$CXX_NAME" >&6
++
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:25638: checking for src modules" >&5
++echo "$as_me:25736: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -25687,20 +25785,24 @@
+ #define HAVE_LIB${cf_have_include} 1
+ EOF
+ 
+-			TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
+-			TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2"
++cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++
++eval TEST_ROOT=\$${cf_map_lib_basename}_NAME
++
++			TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TEST_ROOT}${DFT_DEP_SUFFIX} $TEST_DEPS"
++			TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${TEST_ROOT}${DFT_DEP_SUFFIX} $TEST_DEP2"
+ 			if test "$DFT_LWR_MODEL" = "libtool"; then
+ 				TEST_ARGS="${TEST_DEPS}"
+ 				TEST_ARG2="${TEST_DEP2}"
+ 			else
+-				TEST_ARGS="-l${cf_dir}${USE_ARG_SUFFIX} $TEST_ARGS"
+-				TEST_ARG2="-l${cf_dir}${USE_ARG_SUFFIX} $TEST_ARG2"
++				TEST_ARGS="-l${TEST_ROOT}${USE_ARG_SUFFIX} $TEST_ARGS"
++				TEST_ARG2="-l${TEST_ROOT}${USE_ARG_SUFFIX} $TEST_ARG2"
+ 			fi
+ 			PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}${USE_ARG_SUFFIX}"
+ 		fi
+ 	fi
+ done
+-echo "$as_me:25703: result: $cf_cv_src_modules" >&5
++echo "$as_me:25805: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -25944,12 +26046,6 @@
+ 
+ ADAHTML_DIR=../../doc/html/ada
+ 
+-# these could be configurable, but are not currently
+-PANEL_NAME=panel
+-MENU_NAME=menu
+-FORM_NAME=form
+-CXX_NAME=ncurses++
+-
+ # workaround for OS/2 (20151017)
+ case $cf_cv_system_name in
+ (os2*)
+@@ -25967,7 +26063,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:25970: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:26066: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+ 
+ 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
+@@ -25978,7 +26074,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:25981: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:26077: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -25994,7 +26090,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:25997: result: $PKG_CFLAGS" >&5
++echo "$as_me:26093: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -26055,7 +26151,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
+ 
+-echo "${as_me:-configure}:26058: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:26154: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -26082,7 +26178,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:26085: checking for linker search path" >&5
++echo "$as_me:26181: checking for linker search path" >&5
+ echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
+ if test "${cf_cv_ld_searchpath+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26146,7 +26242,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:26149: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:26245: result: $cf_cv_ld_searchpath" >&5
+ echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
+ 
+ LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
+@@ -26236,7 +26332,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:26239: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:26335: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -26412,7 +26508,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:26415: error: ambiguous option: $1
++    { { echo "$as_me:26511: 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;}
+@@ -26431,7 +26527,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:26434: error: unrecognized option: $1
++  -*) { { echo "$as_me:26530: 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;}
+@@ -26469,12 +26565,14 @@
+ ### Special initialization commands, used to pass information from the
+ ### configuration-run into config.status
+ 
+-AWK="$AWK"
+ ALTERNATE_SYMS="$ALTERNATE_SYMS"
++AWK="$AWK"
++CXX_NAME="$CXX_NAME"
+ DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
+ DFT_LWR_MODEL="$DFT_LWR_MODEL"
+ ECHO_LD="$ECHO_LD"
+ EXTRA_SUFFIX="$EXTRA_SUFFIX"
++FORM_NAME="$FORM_NAME"
+ LDCONFIG="$LDCONFIG"
+ LIBTOOL_VERSION="$LIBTOOL_VERSION"
+ LIB_NAME="$LIB_NAME"
+@@ -26484,10 +26582,12 @@
+ LIB_TRACING="$LIB_TRACING"
+ LN_S="$LN_S"
+ MAKE_TERMINFO="$MAKE_TERMINFO"
++MENU_NAME="$MENU_NAME"
+ NCURSES_MAJOR="$NCURSES_MAJOR"
+ NCURSES_MINOR="$NCURSES_MINOR"
+ NCURSES_OSPEED="$NCURSES_OSPEED"
+ NCURSES_PATCH="$NCURSES_PATCH"
++PANEL_NAME="$PANEL_NAME"
+ SRC_SUBDIRS="$SRC_SUBDIRS"
+ TERMINFO="$TERMINFO"
+ TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
+@@ -26550,7 +26650,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:26553: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:26653: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -26885,6 +26985,10 @@
+ s,@TINFO_LIST@,$TINFO_LIST,;t t
+ s,@SHLIB_LIST@,$SHLIB_LIST,;t t
+ s,@NCURSES_TREE@,$NCURSES_TREE,;t t
++s,@FORM_NAME@,$FORM_NAME,;t t
++s,@MENU_NAME@,$MENU_NAME,;t t
++s,@PANEL_NAME@,$PANEL_NAME,;t t
++s,@CXX_NAME@,$CXX_NAME,;t t
+ s,@TEST_ARGS@,$TEST_ARGS,;t t
+ s,@TEST_DEPS@,$TEST_DEPS,;t t
+ s,@TEST_ARG2@,$TEST_ARG2,;t t
+@@ -26900,10 +27004,6 @@
+ s,@cross_compiling@,$cross_compiling,;t t
+ s,@MAKE_TESTS@,$MAKE_TESTS,;t t
+ s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
+-s,@PANEL_NAME@,$PANEL_NAME,;t t
+-s,@MENU_NAME@,$MENU_NAME,;t t
+-s,@FORM_NAME@,$FORM_NAME,;t t
+-s,@CXX_NAME@,$CXX_NAME,;t t
+ s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t
+ s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t
+ s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t
+@@ -27046,7 +27146,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:27049: creating $ac_file" >&5
++    { echo "$as_me:27149: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -27064,7 +27164,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:27067: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:27167: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -27077,7 +27177,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:27080: error: cannot find input file: $f" >&5
++           { { echo "$as_me:27180: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -27093,7 +27193,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:27096: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:27196: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -27102,7 +27202,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:27105: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:27205: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -27139,7 +27239,7 @@
+             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:27142: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:27242: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -27150,7 +27250,7 @@
+     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:27153: WARNING: Some variables may not be substituted:
++      { echo "$as_me:27253: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -27199,7 +27299,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:27202: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:27302: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -27210,7 +27310,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:27213: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:27313: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -27223,7 +27323,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:27226: error: cannot find input file: $f" >&5
++           { { echo "$as_me:27326: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -27281,7 +27381,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:27284: $ac_file is unchanged" >&5
++      { echo "$as_me:27384: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -27471,8 +27571,21 @@
+ 		cf_depsuf="${LIB_SUFFIX}${EXTRA_SUFFIX}${cf_depsuf}"
+ 	fi
+ 
+-			cf_libname=$cf_dir
+-			test "$cf_dir" = c++ && cf_libname=ncurses++
++			if test "$cf_dir" = "c++"
++			then
++
++cf_map_lib_basename=`echo "cxx" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++
++eval cf_libname=\$${cf_map_lib_basename}_NAME
++
++			else
++
++cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++
++eval cf_libname=\$${cf_map_lib_basename}_NAME
++
++			fi
++			test -z "$cf_libname" && cf_libname="$cf_dir"
+ 			if test $cf_item = shared ; then
+ 				if test -n "${LIB_SUFFIX}"
+ 				then
+@@ -27626,7 +27739,7 @@
+ 				(cygdll|msysdll|mingw)
+ 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
+ 
+-echo "${as_me:-configure}:27629: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:27742: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+@@ -27721,8 +27834,18 @@
+ 					;;
+ 				esac
+ 			elif test $cf_dir = c++ ; then
+-				cf_libname=ncurses++$USE_LIB_SUFFIX
++
++cf_map_lib_basename=`echo "cxx" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++
++eval cf_libname=\$${cf_map_lib_basename}_NAME
++
++				cf_libname=${cf_libname}$USE_LIB_SUFFIX
+ 			else
++
++cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++
++eval cf_libname=\$${cf_map_lib_basename}_NAME
++
+ 				cf_libname=${cf_libname}$USE_LIB_SUFFIX
+ 			fi
+ 			if test -n "${USE_ARG_SUFFIX}" ; then
+Index: configure.in
+Prereq:  1.697 
+--- ncurses-6.2-20200301+/configure.in	2020-02-08 20:56:13.000000000 +0000
++++ ncurses-6.2-20200308/configure.in	2020-03-08 00:53:28.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.697 2020/02/08 20:56:13 tom Exp $
++dnl $Id: configure.in,v 1.700 2020/03/08 00:53:28 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl For additional information, see
+@@ -38,7 +38,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20200111)
+-AC_REVISION($Revision: 1.697 $)
++AC_REVISION($Revision: 1.700 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -2193,6 +2193,12 @@
+ ### predefined stuff for the test programs
+ AC_DEFINE(HAVE_SLK_COLOR,1,[Define to 1 if we have slk_color for test-programs])
+ 
++# pkgsrc uses these
++CF_WITH_LIB_BASENAME(FORM_NAME,form)
++CF_WITH_LIB_BASENAME(MENU_NAME,menu)
++CF_WITH_LIB_BASENAME(PANEL_NAME,panel)
++CF_WITH_LIB_BASENAME(CXX_NAME,cxx,ncurses++)
++
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+@@ -2246,17 +2252,6 @@
+ ADAHTML_DIR=../../doc/html/ada
+ AC_SUBST(ADAHTML_DIR)
+ 
+-# these could be configurable, but are not currently
+-PANEL_NAME=panel
+-MENU_NAME=menu
+-FORM_NAME=form
+-CXX_NAME=ncurses++
+-
+-AC_SUBST(PANEL_NAME)
+-AC_SUBST(MENU_NAME)
+-AC_SUBST(FORM_NAME)
+-AC_SUBST(CXX_NAME)
+-
+ # workaround for OS/2 (20151017)
+ case $cf_cv_system_name in
+ (os2*)
+@@ -2413,12 +2408,14 @@
+ ### Special initialization commands, used to pass information from the
+ ### configuration-run into config.status
+ 
+-AWK="$AWK"
+ ALTERNATE_SYMS="$ALTERNATE_SYMS"
++AWK="$AWK"
++CXX_NAME="$CXX_NAME"
+ DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
+ DFT_LWR_MODEL="$DFT_LWR_MODEL"
+ ECHO_LD="$ECHO_LD"
+ EXTRA_SUFFIX="$EXTRA_SUFFIX"
++FORM_NAME="$FORM_NAME"
+ LDCONFIG="$LDCONFIG"
+ LIBTOOL_VERSION="$LIBTOOL_VERSION"
+ LIB_NAME="$LIB_NAME"
+@@ -2428,10 +2425,12 @@
+ LIB_TRACING="$LIB_TRACING"
+ LN_S="$LN_S"
+ MAKE_TERMINFO="$MAKE_TERMINFO"
++MENU_NAME="$MENU_NAME"
+ NCURSES_MAJOR="$NCURSES_MAJOR"
+ NCURSES_MINOR="$NCURSES_MINOR"
+ NCURSES_OSPEED="$NCURSES_OSPEED"
+ NCURSES_PATCH="$NCURSES_PATCH"
++PANEL_NAME="$PANEL_NAME"
+ SRC_SUBDIRS="$SRC_SUBDIRS"
+ TERMINFO="$TERMINFO"
+ TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
+Index: dist.mk
+Prereq:  1.1338 
+--- ncurses-6.2-20200301+/dist.mk	2020-03-02 01:55:47.000000000 +0000
++++ ncurses-6.2-20200308/dist.mk	2020-03-08 14:28:23.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1338 2020/03/02 01:55:47 tom Exp $
++# $Id: dist.mk,v 1.1340 2020/03/08 14:28:23 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 2
+-NCURSES_PATCH = 20200301
++NCURSES_PATCH = 20200308
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/ncurses_cfg.hin
+Prereq:  1.12 
+--- ncurses-6.2-20200301+/include/ncurses_cfg.hin	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200308/include/ncurses_cfg.hin	2020-03-08 12:37:59.000000000 +0000
+@@ -31,7 +31,7 @@
+  *  Author: Thomas E. Dickey      1997-on                                   *
+  ****************************************************************************/
+ /*
+- * $Id: ncurses_cfg.hin,v 1.12 2020/02/02 23:34:34 tom Exp $
++ * $Id: ncurses_cfg.hin,v 1.13 2020/03/08 12:37:59 tom Exp $
+  *
+  * Both ncurses_cfg.h and ncurses_def.h are internal header-files used when
+  * building ncurses.
+@@ -43,7 +43,7 @@
+  * 971222) to autoconf 2.12 or 2.13 to do this.
+  *
+  * See:
+- *	http://invisible-island.net/autoconf/
++ *	https://invisible-island.net/autoconf/
+  *	ftp://ftp.invisible-island.net/autoconf/
+  */
+ #ifndef NC_CONFIG_H
+Index: misc/gen-pkgconfig.in
+Prereq:  1.44 
+--- ncurses-6.2-20200301+/misc/gen-pkgconfig.in	2020-02-12 00:09:26.000000000 +0000
++++ ncurses-6.2-20200308/misc/gen-pkgconfig.in	2020-03-08 01:57:33.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!@SHELL@
+-# $Id: gen-pkgconfig.in,v 1.44 2020/02/12 00:09:26 tom Exp $
++# $Id: gen-pkgconfig.in,v 1.45 2020/03/08 01:57:33 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+ # Copyright 2009-2015,2018 Free Software Foundation, Inc.                    #
+@@ -44,6 +44,7 @@
+ MENU_NAME=@MENU_NAME@
+ FORM_NAME=@FORM_NAME@
+ CXX_NAME=@CXX_NAME@
++
+ DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
+ TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
+ CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
+@@ -64,9 +65,11 @@
+ 
+ MAIN_LIBRARY="${LIB_NAME}@USE_ARG_SUFFIX@"
+ SUB_LIBRARY="${TINFO_ARG_SUFFIX}"
+-PANEL_LIBRARY="${PANEL_NAME}@USE_ARG_SUFFIX@"
+-MENU_LIBRARY="${MENU_NAME}@USE_ARG_SUFFIX@"
++
++CXX_LIBRARY="${CXX_NAME}@USE_ARG_SUFFIX@"
+ FORM_LIBRARY="${FORM_NAME}@USE_ARG_SUFFIX@"
++MENU_LIBRARY="${MENU_NAME}@USE_ARG_SUFFIX@"
++PANEL_LIBRARY="${PANEL_NAME}@USE_ARG_SUFFIX@"
+ 
+ CFLAGS="@PKG_CFLAGS@"
+ if [ "$includedir" != "/usr/include" ]; then
+@@ -138,6 +141,12 @@
+ for name in @PC_MODULES_TO_MAKE@
+ do
+ 	name="${name}"
++	case $name in
++	form*)		name="$FORM_LIBRARY" 	;;
++	menu*)		name="$MENU_LIBRARY" 	;;
++	panel*)		name="$PANEL_LIBRARY"	;;
++	ncurses++*)	name="$CXX_LIBRARY"		;;
++	esac
+ 	LIBS="-l$name"
+ 
+ 	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
+Index: package/debian-mingw/changelog
+--- ncurses-6.2-20200301+/package/debian-mingw/changelog	2020-03-02 01:55:47.000000000 +0000
++++ ncurses-6.2-20200308/package/debian-mingw/changelog	2020-03-08 14:28:23.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200301) unstable; urgency=low
++ncurses6 (6.2+20200308) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 01 Mar 2020 20:55:47 -0500
++ -- Thomas E. Dickey   Sun, 08 Mar 2020 10:28:23 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw/copyright
+--- ncurses-6.2-20200301+/package/debian-mingw/copyright	2020-01-04 14:49:29.000000000 +0000
++++ ncurses-6.2-20200308/package/debian-mingw/copyright	2020-03-08 12:35:01.000000000 +0000
+@@ -5,7 +5,8 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2019,2020 Free Software Foundation, Inc.
++Copyright: 2017-2019,2020 by Thomas E. Dickey
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+Index: package/debian-mingw64/changelog
+--- ncurses-6.2-20200301+/package/debian-mingw64/changelog	2020-03-02 01:55:47.000000000 +0000
++++ ncurses-6.2-20200308/package/debian-mingw64/changelog	2020-03-08 14:28:23.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200301) unstable; urgency=low
++ncurses6 (6.2+20200308) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 01 Mar 2020 20:55:47 -0500
++ -- Thomas E. Dickey   Sun, 08 Mar 2020 10:28:23 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/copyright
+--- ncurses-6.2-20200301+/package/debian-mingw64/copyright	2020-01-04 14:49:29.000000000 +0000
++++ ncurses-6.2-20200308/package/debian-mingw64/copyright	2020-03-08 12:35:01.000000000 +0000
+@@ -5,7 +5,8 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2019,2020 Free Software Foundation, Inc.
++Copyright: 2017-2019,2020 by Thomas E. Dickey
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+Index: package/debian/changelog
+--- ncurses-6.2-20200301+/package/debian/changelog	2020-03-02 01:55:47.000000000 +0000
++++ ncurses-6.2-20200308/package/debian/changelog	2020-03-08 14:28:23.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200301) unstable; urgency=low
++ncurses6 (6.2+20200308) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 01 Mar 2020 20:55:47 -0500
++ -- Thomas E. Dickey   Sun, 08 Mar 2020 10:28:23 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/debian/copyright
+--- ncurses-6.2-20200301+/package/debian/copyright	2020-01-04 14:49:29.000000000 +0000
++++ ncurses-6.2-20200308/package/debian/copyright	2020-03-08 12:34:40.000000000 +0000
+@@ -5,7 +5,8 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2019,2020 Free Software Foundation, Inc.
++Copyright: 2017-2019,2020 by Thomas E. Dickey
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+Index: package/mingw-ncurses.nsi
+Prereq:  1.381 
+--- ncurses-6.2-20200301+/package/mingw-ncurses.nsi	2020-03-02 01:55:47.000000000 +0000
++++ ncurses-6.2-20200308/package/mingw-ncurses.nsi	2020-03-08 14:28:23.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.381 2020/03/02 01:55:47 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.384 2020/03/08 14:28:23 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "2"
+ !define VERSION_YYYY  "2020"
+-!define VERSION_MMDD  "0301"
++!define VERSION_MMDD  "0308"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+@@ -32,7 +32,7 @@
+ SetCompressor /SOLID lzma
+ 
+ VIAddVersionKey ProductName "${SUBKEY}"
+-VIAddVersionKey CompanyName "http://invisible-island.net"
++VIAddVersionKey CompanyName "https://invisible-island.net"
+ VIAddVersionKey FileDescription "NCurses Installer (MinGW)"
+ VIAddVersionKey FileVersion ${VERSION_FULL}
+ VIAddVersionKey ProductVersion ${VERSION_FULL}
+Index: package/mingw-ncurses.spec
+--- ncurses-6.2-20200301+/package/mingw-ncurses.spec	2020-03-02 01:55:47.000000000 +0000
++++ ncurses-6.2-20200308/package/mingw-ncurses.spec	2020-03-08 14:28:23.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.2
+-Release: 20200301
++Release: 20200308
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.2-20200301+/package/ncurses.spec	2020-03-02 01:55:47.000000000 +0000
++++ ncurses-6.2-20200308/package/ncurses.spec	2020-03-08 14:28:23.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.2
+-Release: 20200301
++Release: 20200308
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.2-20200301+/package/ncursest.spec	2020-03-02 01:55:47.000000000 +0000
++++ ncurses-6.2-20200308/package/ncursest.spec	2020-03-08 14:28:23.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.2
+-Release: 20200301
++Release: 20200308
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/Makefile.in
+Prereq:  1.122 
+--- ncurses-6.2-20200301+/test/Makefile.in	2020-02-22 16:51:31.000000000 +0000
++++ ncurses-6.2-20200308/test/Makefile.in	2020-03-08 16:15:42.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.122 2020/02/22 16:51:31 tom Exp $
++# $Id: Makefile.in,v 1.123 2020/03/08 16:15:42 tom Exp $
+ ##############################################################################
+ # Copyright 2020 Thomas E. Dickey                                            #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
+@@ -122,11 +122,11 @@
+ LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT)
+ 
+ # use these for linking with the (n)curses library and possibly pthreads
+-LIBS_THREADS	= `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) @PTHREAD@
++LIBS_THREADS	= `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) @PTHREAD@
+ LDFLAGS_THREADS	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_THREADS)
+ 
+ # use these for linking with the (n)curses library
+-LIBS_CURSES	= `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB)
++LIBS_CURSES	= `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) $(MATH_LIB)
+ LDFLAGS_CURSES	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
+ 
+ # use these for linking with the tinfo library if we have it, or curses library if not
+Index: test/aclocal.m4
+Prereq:  1.177 
+--- ncurses-6.2-20200301+/test/aclocal.m4	2020-02-27 10:21:59.000000000 +0000
++++ ncurses-6.2-20200308/test/aclocal.m4	2020-03-08 14:13:15.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.177 2020/02/27 10:21:59 tom Exp $
++dnl $Id: aclocal.m4,v 1.178 2020/03/08 14:13:15 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -3796,6 +3796,35 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_WITH_LIB_BASENAME version: 1 updated: 2020/03/07 20:05:14
++dnl --------------------
++dnl Allow for overriding the basename of a library, i.e., the part to which
++dnl prefixes/suffixes are attached.
++dnl
++dnl $1 = variable to set
++dnl $2 = option name
++dnl $3 = default basename for library, if omitted use $2
++AC_DEFUN([CF_WITH_LIB_BASENAME],
++[
++AC_MSG_CHECKING(for desired basename for $2 library)
++AC_ARG_WITH($2-libname,
++	[  --with-$2-libname=XXX override ifelse($3,,$2,$3) basename of library],
++	[with_lib_basename=$withval],
++	[with_lib_basename=ifelse($3,,$2,$3)])
++$1="$with_lib_basename"
++
++case "x[$]$1" in
++(x|xno|xnone|xyes)
++	$1=ifelse($3,,$2,$3)
++	;;
++(*)
++	;;
++esac
++
++AC_MSG_RESULT([$]$1)
++AC_SUBST($1)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_WITH_NCURSES_ETC version: 5 updated: 2016/02/20 19:23:20
+ dnl -------------------
+ dnl Use this macro for programs which use any variant of "curses", e.g.,
+Index: test/configure
+--- ncurses-6.2-20200301+/test/configure	2020-02-27 10:21:59.000000000 +0000
++++ ncurses-6.2-20200308/test/configure	2020-03-08 14:13:38.000000000 +0000
+@@ -686,6 +686,9 @@
+   --with-XawPlus          link with Athena-Plus library
+   --with-x                use the X Window System
+   --with-x11-rgb=FILE   file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)
++  --with-form-libname=XXX override form basename of library
++  --with-menu-libname=XXX override menu basename of library
++  --with-panel-libname=XXX override panel basename of library
+   --disable-panel         disable checks for panel functions
+   --disable-menu          disable checks for menu functions
+   --disable-form          disable checks for form functions
+@@ -889,7 +892,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:892: loading site script $ac_site_file" >&5
++    { echo "$as_me:895: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -900,7 +903,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:903: loading cache $cache_file" >&5
++    { echo "$as_me:906: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -908,7 +911,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:911: creating cache $cache_file" >&5
++  { echo "$as_me:914: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -924,21 +927,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:927: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:930: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:931: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:934: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:937: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:940: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:939:   former value:  $ac_old_val" >&5
++        { echo "$as_me:942:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:941:   current value: $ac_new_val" >&5
++        { echo "$as_me:944:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -957,9 +960,9 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:960: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:963: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:962: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:965: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -980,10 +983,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:983: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:986: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:986: \$? = $ac_status" >&5
++  echo "$as_me:989: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   ac_path_separator=';'
+ else
+@@ -1015,7 +1018,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1018: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1021: 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
+@@ -1025,11 +1028,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1028: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1031: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1032: checking build system type" >&5
++echo "$as_me:1035: 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
+@@ -1038,16 +1041,16 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1041: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1044: 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:1045: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1048: 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:1050: result: $ac_cv_build" >&5
++echo "$as_me:1053: 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/'`
+@@ -1055,7 +1058,7 @@
+ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
+-	echo "$as_me:1058: checking host system type" >&5
++	echo "$as_me:1061: 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
+@@ -1064,12 +1067,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:1067: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1070: 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:1072: result: $ac_cv_host" >&5
++echo "$as_me:1075: 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/'`
+@@ -1095,13 +1098,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1098: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1101: 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:1102: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1105: 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:1104: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1107: 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
+@@ -1119,7 +1122,7 @@
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ rm conftest.sed
+ 
+-echo "$as_me:1122: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:1125: 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
+@@ -1139,11 +1142,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:1142: result: yes" >&5
++  echo "$as_me:1145: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:1146: result: no" >&5
++  echo "$as_me:1149: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -1157,7 +1160,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:1160: checking for $ac_word" >&5
++echo "$as_me:1163: 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
+@@ -1172,7 +1175,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:1175: found $ac_dir/$ac_word" >&5
++echo "$as_me:1178: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1180,10 +1183,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1183: result: $CC" >&5
++  echo "$as_me:1186: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1186: result: no" >&5
++  echo "$as_me:1189: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1192,7 +1195,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:1195: checking for $ac_word" >&5
++echo "$as_me:1198: 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
+@@ -1207,7 +1210,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:1210: found $ac_dir/$ac_word" >&5
++echo "$as_me:1213: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1215,10 +1218,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1218: result: $ac_ct_CC" >&5
++  echo "$as_me:1221: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1221: result: no" >&5
++  echo "$as_me:1224: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1231,7 +1234,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:1234: checking for $ac_word" >&5
++echo "$as_me:1237: 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
+@@ -1246,7 +1249,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:1249: found $ac_dir/$ac_word" >&5
++echo "$as_me:1252: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1254,10 +1257,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1257: result: $CC" >&5
++  echo "$as_me:1260: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1260: result: no" >&5
++  echo "$as_me:1263: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1266,7 +1269,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:1269: checking for $ac_word" >&5
++echo "$as_me:1272: 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
+@@ -1281,7 +1284,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:1284: found $ac_dir/$ac_word" >&5
++echo "$as_me:1287: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1289,10 +1292,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1292: result: $ac_ct_CC" >&5
++  echo "$as_me:1295: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1295: result: no" >&5
++  echo "$as_me:1298: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1305,7 +1308,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:1308: checking for $ac_word" >&5
++echo "$as_me:1311: 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
+@@ -1325,7 +1328,7 @@
+   continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1328: found $ac_dir/$ac_word" >&5
++echo "$as_me:1331: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1347,10 +1350,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1350: result: $CC" >&5
++  echo "$as_me:1353: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1353: result: no" >&5
++  echo "$as_me:1356: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1361,7 +1364,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:1364: checking for $ac_word" >&5
++echo "$as_me:1367: 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
+@@ -1376,7 +1379,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:1379: found $ac_dir/$ac_word" >&5
++echo "$as_me:1382: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1384,10 +1387,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1387: result: $CC" >&5
++  echo "$as_me:1390: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1390: result: no" >&5
++  echo "$as_me:1393: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1400,7 +1403,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:1403: checking for $ac_word" >&5
++echo "$as_me:1406: 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
+@@ -1415,7 +1418,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:1418: found $ac_dir/$ac_word" >&5
++echo "$as_me:1421: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1423,10 +1426,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1426: result: $ac_ct_CC" >&5
++  echo "$as_me:1429: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1429: result: no" >&5
++  echo "$as_me:1432: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1438,32 +1441,32 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1441: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1444: 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:1446:" \
++echo "$as_me:1449:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1449: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:1452: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1452: \$? = $ac_status" >&5
++  echo "$as_me:1455: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1454: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:1457: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1457: \$? = $ac_status" >&5
++  echo "$as_me:1460: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1459: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:1462: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1462: \$? = $ac_status" >&5
++  echo "$as_me:1465: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1466 "configure"
++#line 1469 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1479,13 +1482,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:1482: checking for C compiler default output" >&5
++echo "$as_me:1485: 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:1485: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1488: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1488: \$? = $ac_status" >&5
++  echo "$as_me:1491: \$? = $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
+@@ -1508,34 +1511,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1511: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1514: 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:1517: result: $ac_file" >&5
++echo "$as_me:1520: 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:1522: checking whether the C compiler works" >&5
++echo "$as_me:1525: 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:1528: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1531: \$? = $ac_status" >&5
++  echo "$as_me:1534: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1538: error: cannot run C compiled programs.
++	{ { echo "$as_me:1541: 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;}
+@@ -1543,24 +1546,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1546: result: yes" >&5
++echo "$as_me:1549: 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:1553: checking whether we are cross compiling" >&5
++echo "$as_me:1556: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1555: result: $cross_compiling" >&5
++echo "$as_me:1558: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1558: checking for executable suffix" >&5
++echo "$as_me:1561: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1560: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1563: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1563: \$? = $ac_status" >&5
++  echo "$as_me:1566: \$? = $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
+@@ -1576,25 +1579,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1579: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1582: 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:1585: result: $ac_cv_exeext" >&5
++echo "$as_me:1588: 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:1591: checking for object suffix" >&5
++echo "$as_me:1594: 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 1597 "configure"
++#line 1600 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1606,10 +1609,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1609: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1612: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1612: \$? = $ac_status" >&5
++  echo "$as_me:1615: \$? = $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
+@@ -1621,24 +1624,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1624: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1627: 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:1631: result: $ac_cv_objext" >&5
++echo "$as_me:1634: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1635: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1638: 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 1641 "configure"
++#line 1644 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1653,16 +1656,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1659: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1659: \$? = $ac_status" >&5
++  echo "$as_me:1662: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1665: \$? = $ac_status" >&5
++  echo "$as_me:1668: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1674,19 +1677,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1677: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1680: 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:1683: checking whether $CC accepts -g" >&5
++echo "$as_me:1686: 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 1689 "configure"
++#line 1692 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1698,16 +1701,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1701: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1704: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1704: \$? = $ac_status" >&5
++  echo "$as_me:1707: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1710: \$? = $ac_status" >&5
++  echo "$as_me:1713: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1717,7 +1720,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1720: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1723: 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
+@@ -1744,16 +1747,16 @@
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1747: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1750: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1750: \$? = $ac_status" >&5
++  echo "$as_me:1753: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1756: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1756: \$? = $ac_status" >&5
++  echo "$as_me:1759: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -1765,7 +1768,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1768 "configure"
++#line 1771 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -1778,16 +1781,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1781: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1784: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1784: \$? = $ac_status" >&5
++  echo "$as_me:1787: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1787: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1790: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1790: \$? = $ac_status" >&5
++  echo "$as_me:1793: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -1797,7 +1800,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1800 "configure"
++#line 1803 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -1809,16 +1812,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1815: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1815: \$? = $ac_status" >&5
++  echo "$as_me:1818: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1818: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1821: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1821: \$? = $ac_status" >&5
++  echo "$as_me:1824: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -1848,11 +1851,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:1851: checking version of $CC" >&5
++	echo "$as_me:1854: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:1855: result: $GCC_VERSION" >&5
++	echo "$as_me:1858: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -1861,12 +1864,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:1864: checking if this is really Intel C compiler" >&5
++		echo "$as_me:1867: 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 1869 "configure"
++#line 1872 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1883,16 +1886,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1886: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1889: \$? = $ac_status" >&5
++  echo "$as_me:1892: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1895: \$? = $ac_status" >&5
++  echo "$as_me:1898: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -1903,7 +1906,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:1906: result: $INTEL_COMPILER" >&5
++		echo "$as_me:1909: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -1912,12 +1915,12 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:1915: checking if this is really Clang C compiler" >&5
++	echo "$as_me:1918: checking if this is really Clang C compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	CFLAGS="$CFLAGS -Qunused-arguments"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 1920 "configure"
++#line 1923 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1934,16 +1937,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1937: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1940: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1940: \$? = $ac_status" >&5
++  echo "$as_me:1943: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1943: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1946: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1946: \$? = $ac_status" >&5
++  echo "$as_me:1949: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -1954,11 +1957,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:1957: result: $CLANG_COMPILER" >&5
++	echo "$as_me:1960: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+-echo "$as_me:1961: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:1964: 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
+@@ -1966,7 +1969,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1969 "configure"
++#line 1972 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2015,16 +2018,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2018: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2021: \$? = $ac_status" >&5
++  echo "$as_me:2024: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2027: \$? = $ac_status" >&5
++  echo "$as_me:2030: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2041,10 +2044,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2044: result: none needed" >&5
++    echo "$as_me:2047: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2047: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2050: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2052,13 +2055,13 @@
+ # This should have been defined by AC_PROG_CC
+ : ${CC:=cc}
+ 
+-echo "$as_me:2055: checking \$CFLAGS variable" >&5
++echo "$as_me:2058: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2059: result: broken" >&5
++	echo "$as_me:2062: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2061: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2064: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+ echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
+ 	cf_flags="$CFLAGS"
+ 	CFLAGS=
+@@ -2166,18 +2169,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:2169: result: ok" >&5
++	echo "$as_me:2172: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2174: checking \$CC variable" >&5
++echo "$as_me:2177: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2178: result: broken" >&5
++	echo "$as_me:2181: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2180: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2183: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+ echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
+ 	# humor him...
+ 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
+@@ -2294,24 +2297,24 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2297: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2300: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2301: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2304: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2305: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2308: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2309: result: ok" >&5
++	echo "$as_me:2312: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2314: checking for inline" >&5
++echo "$as_me:2317: 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
+@@ -2319,7 +2322,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2322 "configure"
++#line 2325 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -2328,16 +2331,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2331: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2334: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2334: \$? = $ac_status" >&5
++  echo "$as_me:2337: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2337: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2340: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2340: \$? = $ac_status" >&5
++  echo "$as_me:2343: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -2348,7 +2351,7 @@
+ done
+ 
+ fi
+-echo "$as_me:2351: result: $ac_cv_c_inline" >&5
++echo "$as_me:2354: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -2369,7 +2372,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:2372: checking how to run the C preprocessor" >&5
++echo "$as_me:2375: 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
+@@ -2390,18 +2393,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 2393 "configure"
++#line 2396 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2398: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2401: \"$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:2404: \$? = $ac_status" >&5
++  echo "$as_me:2407: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2424,17 +2427,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2427 "configure"
++#line 2430 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2431: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2434: \"$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:2437: \$? = $ac_status" >&5
++  echo "$as_me:2440: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2471,7 +2474,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2474: result: $CPP" >&5
++echo "$as_me:2477: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2481,18 +2484,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 2484 "configure"
++#line 2487 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2489: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2492: \"$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:2495: \$? = $ac_status" >&5
++  echo "$as_me:2498: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2515,17 +2518,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2518 "configure"
++#line 2521 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2522: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2525: \"$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:2528: \$? = $ac_status" >&5
++  echo "$as_me:2531: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2553,7 +2556,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2556: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2559: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2569,7 +2572,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:2572: checking for $ac_word" >&5
++echo "$as_me:2575: 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
+@@ -2584,7 +2587,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:2587: found $ac_dir/$ac_word" >&5
++echo "$as_me:2590: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2592,10 +2595,10 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:2595: result: $AWK" >&5
++  echo "$as_me:2598: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:2598: result: no" >&5
++  echo "$as_me:2601: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2614,7 +2617,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:2617: checking for a BSD compatible install" >&5
++echo "$as_me:2620: 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
+@@ -2663,7 +2666,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:2666: result: $INSTALL" >&5
++echo "$as_me:2669: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -2684,7 +2687,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:2687: checking if you want to install stripped executables" >&5
++echo "$as_me:2690: checking if you want to install stripped executables" >&5
+ echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
+ 
+ # Check whether --enable-stripping or --disable-stripping was given.
+@@ -2701,7 +2704,7 @@
+ 	with_stripping=yes
+ 
+ fi;
+-echo "$as_me:2704: result: $with_stripping" >&5
++echo "$as_me:2707: result: $with_stripping" >&5
+ echo "${ECHO_T}$with_stripping" >&6
+ 
+ if test "$with_stripping" = yes
+@@ -2712,7 +2715,7 @@
+ fi
+ 
+ : ${INSTALL:=install}
+-echo "$as_me:2715: checking if install accepts -p option" >&5
++echo "$as_me:2718: checking if install accepts -p option" >&5
+ echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
+ if test "${cf_cv_install_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2743,10 +2746,10 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:2746: result: $cf_cv_install_p" >&5
++echo "$as_me:2749: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:2749: checking if install needs to be told about ownership" >&5
++echo "$as_me:2752: checking if install needs to be told about ownership" >&5
+ echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
+ case `$ac_config_guess` in
+ (*minix)
+@@ -2757,7 +2760,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:2760: result: $with_install_o" >&5
++echo "$as_me:2763: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -2770,7 +2773,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:2773: checking for $ac_word" >&5
++echo "$as_me:2776: 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
+@@ -2785,7 +2788,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:2788: found $ac_dir/$ac_word" >&5
++echo "$as_me:2791: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2793,10 +2796,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:2796: result: $LINT" >&5
++  echo "$as_me:2799: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:2799: result: no" >&5
++  echo "$as_me:2802: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2809,7 +2812,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:2812: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:2815: 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
+@@ -2836,7 +2839,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:2839: result: $cf_cv_mixedcase" >&5
++echo "$as_me:2842: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -2847,7 +2850,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:2850: checking for $ac_word" >&5
++echo "$as_me:2853: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CTAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2862,7 +2865,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:2865: found $ac_dir/$ac_word" >&5
++echo "$as_me:2868: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2870,10 +2873,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:2873: result: $CTAGS" >&5
++  echo "$as_me:2876: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:2876: result: no" >&5
++  echo "$as_me:2879: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2884,7 +2887,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:2887: checking for $ac_word" >&5
++echo "$as_me:2890: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ETAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2899,7 +2902,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:2902: found $ac_dir/$ac_word" >&5
++echo "$as_me:2905: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2907,10 +2910,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:2910: result: $ETAGS" >&5
++  echo "$as_me:2913: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:2913: result: no" >&5
++  echo "$as_me:2916: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2919,7 +2922,7 @@
+ 
+ # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
+ set dummy ${CTAGS:-ctags}; ac_word=$2
+-echo "$as_me:2922: checking for $ac_word" >&5
++echo "$as_me:2925: 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
+@@ -2934,7 +2937,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:2937: found $ac_dir/$ac_word" >&5
++echo "$as_me:2940: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2943,17 +2946,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:2946: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:2949: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:2949: result: no" >&5
++  echo "$as_me:2952: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ if test "$cf_cv_mixedcase" = yes ; then
+ 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
+ set dummy ${ETAGS:-etags}; ac_word=$2
+-echo "$as_me:2956: checking for $ac_word" >&5
++echo "$as_me:2959: 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
+@@ -2968,7 +2971,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:2971: found $ac_dir/$ac_word" >&5
++echo "$as_me:2974: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2977,10 +2980,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:2980: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:2983: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:2983: result: no" >&5
++  echo "$as_me:2986: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3000,14 +3003,14 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:3003: checking if -lm needed for math functions" >&5
++echo "$as_me:3006: 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 3010 "configure"
++#line 3013 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -3023,16 +3026,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3026: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3029: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3029: \$? = $ac_status" >&5
++  echo "$as_me:3032: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3032: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3035: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3035: \$? = $ac_status" >&5
++  echo "$as_me:3038: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -3042,7 +3045,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:3045: result: $cf_cv_need_libm" >&5
++echo "$as_me:3048: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -3101,10 +3104,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:3104: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:3107: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:3159: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3159: \$? = $ac_status" >&5
++  echo "$as_me:3162: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:3161: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:3164: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -3217,7 +3220,7 @@
+ rm -rf conftest*
+ fi
+ 
+-echo "$as_me:3220: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:3223: checking if you want to work around bogus compiler/loader warnings" >&5
+ echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-string-hacks or --disable-string-hacks was given.
+@@ -3227,7 +3230,7 @@
+ else
+   with_string_hacks=no
+ fi;
+-echo "$as_me:3230: result: $with_string_hacks" >&5
++echo "$as_me:3233: result: $with_string_hacks" >&5
+ echo "${ECHO_T}$with_string_hacks" >&6
+ 
+ if test "x$with_string_hacks" = "xyes"; then
+@@ -3236,15 +3239,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:3239: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:3242: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+ echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
+-	echo "$as_me:3241: checking for strlcat" >&5
++	echo "$as_me:3244: checking for strlcat" >&5
+ echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
+ if test "${ac_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3247 "configure"
++#line 3250 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -3275,16 +3278,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3278: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3281: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3281: \$? = $ac_status" >&5
++  echo "$as_me:3284: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3287: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3287: \$? = $ac_status" >&5
++  echo "$as_me:3290: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -3294,7 +3297,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:3297: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:3300: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
+ 
+@@ -3304,7 +3307,7 @@
+ 
+ else
+ 
+-		echo "$as_me:3307: checking for strlcat in -lbsd" >&5
++		echo "$as_me:3310: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3312,7 +3315,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3315 "configure"
++#line 3318 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3331,16 +3334,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3334: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3337: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3337: \$? = $ac_status" >&5
++  echo "$as_me:3340: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3343: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3343: \$? = $ac_status" >&5
++  echo "$as_me:3346: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -3351,7 +3354,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3354: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:3357: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test $ac_cv_lib_bsd_strlcat = yes; then
+ 
+@@ -3374,23 +3377,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3377: checking for $ac_header" >&5
++echo "$as_me:3380: 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 3383 "configure"
++#line 3386 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3387: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:3390: \"$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:3393: \$? = $ac_status" >&5
++  echo "$as_me:3396: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3409,7 +3412,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:3412: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:3415: 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 <&5
++echo "$as_me:3436: 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 3439 "configure"
++#line 3442 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -3467,16 +3470,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3470: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3473: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3473: \$? = $ac_status" >&5
++  echo "$as_me:3476: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3476: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3479: \$? = $ac_status" >&5
++  echo "$as_me:3482: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -3486,7 +3489,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:3489: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:3492: 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 <&5
++echo "$as_me:3504: checking if the POSIX test-macros are already defined" >&5
+ echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+ if test "${cf_cv_posix_visible+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3508 "configure"
++#line 3511 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3524,16 +3527,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3530: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3530: \$? = $ac_status" >&5
++  echo "$as_me:3533: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3536: \$? = $ac_status" >&5
++  echo "$as_me:3539: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -3544,7 +3547,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3547: result: $cf_cv_posix_visible" >&5
++echo "$as_me:3550: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -3589,14 +3592,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:3592: checking if this is the GNU C library" >&5
++echo "$as_me:3595: checking if this is the GNU C library" >&5
+ echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3599 "configure"
++#line 3602 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3615,16 +3618,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3618: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3621: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3621: \$? = $ac_status" >&5
++  echo "$as_me:3624: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3627: \$? = $ac_status" >&5
++  echo "$as_me:3630: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -3635,7 +3638,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3638: result: $cf_cv_gnu_library" >&5
++echo "$as_me:3641: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -3643,7 +3646,7 @@
+ 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+ 	# was changed to help a little.  newlib incorporated the change about 4
+ 	# years later.
+-	echo "$as_me:3646: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:3649: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+ echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3655,7 +3658,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 3658 "configure"
++#line 3661 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3674,16 +3677,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3677: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3680: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3680: \$? = $ac_status" >&5
++  echo "$as_me:3683: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3686: \$? = $ac_status" >&5
++  echo "$as_me:3689: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -3695,12 +3698,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:3698: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:3701: result: $cf_cv_gnu_library_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+ 
+ 	if test "x$cf_cv_gnu_library_219" = xyes; then
+ 		cf_save="$CPPFLAGS"
+-		echo "$as_me:3703: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:3706: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3805,7 +3808,7 @@
+ fi
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 3808 "configure"
++#line 3811 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -3825,16 +3828,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3828: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3831: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3831: \$? = $ac_status" >&5
++  echo "$as_me:3834: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3834: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3837: \$? = $ac_status" >&5
++  echo "$as_me:3840: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -3845,7 +3848,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3848: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:3851: result: $cf_cv_gnu_dftsrc_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+ 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+ 	else
+@@ -3854,14 +3857,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:3857: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:3860: 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 3864 "configure"
++#line 3867 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -3876,16 +3879,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3879: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3882: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3882: \$? = $ac_status" >&5
++  echo "$as_me:3885: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3888: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3888: \$? = $ac_status" >&5
++  echo "$as_me:3891: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -3992,7 +3995,7 @@
+ fi
+ 
+ 			 cat >conftest.$ac_ext <<_ACEOF
+-#line 3995 "configure"
++#line 3998 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4007,16 +4010,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4013: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4013: \$? = $ac_status" >&5
++  echo "$as_me:4016: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4019: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4019: \$? = $ac_status" >&5
++  echo "$as_me:4022: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -4031,12 +4034,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4034: result: $cf_cv_gnu_source" >&5
++echo "$as_me:4037: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ 
+ 		if test "$cf_cv_gnu_source" = yes
+ 		then
+-		echo "$as_me:4039: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:4042: checking if we should also define _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_default_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4046,7 +4049,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 4049 "configure"
++#line 4052 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4061,16 +4064,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4064: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4067: \$? = $ac_status" >&5
++  echo "$as_me:4070: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4073: \$? = $ac_status" >&5
++  echo "$as_me:4076: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -4081,7 +4084,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4084: result: $cf_cv_default_source" >&5
++echo "$as_me:4087: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -4118,16 +4121,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:4121: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4124: 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}:4127: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4130: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4130 "configure"
++#line 4133 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4142,16 +4145,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4145: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4148: \$? = $ac_status" >&5
++  echo "$as_me:4151: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4154: \$? = $ac_status" >&5
++  echo "$as_me:4157: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -4172,7 +4175,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 4175 "configure"
++#line 4178 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4187,16 +4190,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4190: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4193: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4193: \$? = $ac_status" >&5
++  echo "$as_me:4196: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4196: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4199: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4199: \$? = $ac_status" >&5
++  echo "$as_me:4202: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -4207,7 +4210,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:4210: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4213: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4215,10 +4218,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:4218: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4221: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 4221 "configure"
++#line 4224 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4233,16 +4236,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4236: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4239: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4239: \$? = $ac_status" >&5
++  echo "$as_me:4242: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4242: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4245: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4245: \$? = $ac_status" >&5
++  echo "$as_me:4248: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -4258,7 +4261,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4261: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4264: 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
+@@ -4398,14 +4401,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:4401: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:4404: 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 4408 "configure"
++#line 4411 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -4424,16 +4427,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4427: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4430: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4430: \$? = $ac_status" >&5
++  echo "$as_me:4433: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4433: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4436: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4436: \$? = $ac_status" >&5
++  echo "$as_me:4439: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -4445,7 +4448,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 4448 "configure"
++#line 4451 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -4464,16 +4467,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4467: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4470: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4470: \$? = $ac_status" >&5
++  echo "$as_me:4473: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4473: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4476: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4476: \$? = $ac_status" >&5
++  echo "$as_me:4479: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -4488,7 +4491,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4491: result: $cf_cv_xopen_source" >&5
++echo "$as_me:4494: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -4618,16 +4621,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:4621: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4624: 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}:4627: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4630: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4630 "configure"
++#line 4633 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4642,16 +4645,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4645: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4648: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4648: \$? = $ac_status" >&5
++  echo "$as_me:4651: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4654: \$? = $ac_status" >&5
++  echo "$as_me:4657: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -4672,7 +4675,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 4675 "configure"
++#line 4678 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4687,16 +4690,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4690: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4693: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4693: \$? = $ac_status" >&5
++  echo "$as_me:4696: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4699: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4699: \$? = $ac_status" >&5
++  echo "$as_me:4702: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -4707,7 +4710,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:4710: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4713: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4715,10 +4718,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:4718: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4721: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 4721 "configure"
++#line 4724 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4733,16 +4736,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4736: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4739: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4739: \$? = $ac_status" >&5
++  echo "$as_me:4742: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4742: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4745: \$? = $ac_status" >&5
++  echo "$as_me:4748: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -4758,7 +4761,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:4761: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4764: 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
+@@ -4952,7 +4955,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:4955: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:4958: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -4962,7 +4965,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:4965: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:4968: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -4972,7 +4975,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:4975: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:4978: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -4982,10 +4985,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:4985: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:4988: checking if _XOPEN_SOURCE really is set" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4988 "configure"
++#line 4991 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5000,16 +5003,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5003: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5006: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5006: \$? = $ac_status" >&5
++  echo "$as_me:5009: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5012: \$? = $ac_status" >&5
++  echo "$as_me:5015: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -5018,12 +5021,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:5021: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:5024: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
+ 	if test $cf_XOPEN_SOURCE_set = yes
+ 	then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5026 "configure"
++#line 5029 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5038,16 +5041,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5041: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5044: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5044: \$? = $ac_status" >&5
++  echo "$as_me:5047: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5050: \$? = $ac_status" >&5
++  echo "$as_me:5053: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -5058,19 +5061,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		if test $cf_XOPEN_SOURCE_set_ok = no
+ 		then
+-			{ echo "$as_me:5061: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:5064: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:5066: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5069: 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 5073 "configure"
++#line 5076 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -5089,16 +5092,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5092: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5095: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5095: \$? = $ac_status" >&5
++  echo "$as_me:5098: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5101: \$? = $ac_status" >&5
++  echo "$as_me:5104: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5110,7 +5113,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 5113 "configure"
++#line 5116 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -5129,16 +5132,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5132: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5135: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5135: \$? = $ac_status" >&5
++  echo "$as_me:5138: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5138: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5141: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5141: \$? = $ac_status" >&5
++  echo "$as_me:5144: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5153,7 +5156,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:5156: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5159: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5272,7 +5275,7 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:5275: checking for signal global datatype" >&5
++echo "$as_me:5278: 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
+@@ -5284,7 +5287,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 5287 "configure"
++#line 5290 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -5307,16 +5310,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5310: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5313: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5313: \$? = $ac_status" >&5
++  echo "$as_me:5316: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5319: \$? = $ac_status" >&5
++  echo "$as_me:5322: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -5330,7 +5333,7 @@
+ 
+ fi
+ 
+-echo "$as_me:5333: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:5336: 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 <&5
++echo "$as_me:5345: 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 5349 "configure"
++#line 5352 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -5361,23 +5364,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5364: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5367: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5367: \$? = $ac_status" >&5
++  echo "$as_me:5370: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5370: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5373: \$? = $ac_status" >&5
++  echo "$as_me:5376: \$? = $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 5380 "configure"
++#line 5383 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -5395,16 +5398,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5398: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5401: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5401: \$? = $ac_status" >&5
++  echo "$as_me:5404: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5407: \$? = $ac_status" >&5
++  echo "$as_me:5410: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -5418,11 +5421,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:5421: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:5424: 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:5425: checking for actual SIGWINCH definition" >&5
++echo "$as_me:5428: 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
+@@ -5433,7 +5436,7 @@
+ while test $cf_sigwinch != 1
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 5436 "configure"
++#line 5439 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -5455,16 +5458,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5458: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5461: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5461: \$? = $ac_status" >&5
++  echo "$as_me:5464: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5464: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5467: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5467: \$? = $ac_status" >&5
++  echo "$as_me:5470: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -5478,7 +5481,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5481: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:5484: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -5488,13 +5491,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:5491: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:5494: 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 5497 "configure"
++#line 5500 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5506,16 +5509,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5509: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5512: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5512: \$? = $ac_status" >&5
++  echo "$as_me:5515: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5515: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5518: \$? = $ac_status" >&5
++  echo "$as_me:5521: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -5526,7 +5529,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:5529: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:5532: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test $am_cv_langinfo_codeset = yes; then
+ 
+@@ -5536,7 +5539,7 @@
+ 
+ 	fi
+ 
+-echo "$as_me:5539: checking if you want to use pkg-config" >&5
++echo "$as_me:5542: 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.
+@@ -5546,7 +5549,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:5549: result: $cf_pkg_config" >&5
++echo "$as_me:5552: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case $cf_pkg_config in
+@@ -5558,7 +5561,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-echo "$as_me:5561: checking for $ac_word" >&5
++echo "$as_me:5564: 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
+@@ -5575,7 +5578,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:5578: found $ac_dir/$ac_word" >&5
++   echo "$as_me:5581: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -5586,10 +5589,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:5589: result: $PKG_CONFIG" >&5
++  echo "$as_me:5592: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:5592: result: no" >&5
++  echo "$as_me:5595: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5598,7 +5601,7 @@
+   ac_pt_PKG_CONFIG=$PKG_CONFIG
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:5601: checking for $ac_word" >&5
++echo "$as_me:5604: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5615,7 +5618,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:5618: found $ac_dir/$ac_word" >&5
++   echo "$as_me:5621: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -5627,10 +5630,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:5630: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:5633: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:5633: result: no" >&5
++  echo "$as_me:5636: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5673,18 +5676,18 @@
+ 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5676: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:5679: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ elif test "x$cf_pkg_config" != xno ; then
+-	{ echo "$as_me:5683: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:5686: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+-echo "$as_me:5687: checking if you want to see long compiling messages" >&5
++echo "$as_me:5690: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -5718,10 +5721,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:5721: result: $enableval" >&5
++echo "$as_me:5724: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:5724: checking for ncurses wrap-prefix" >&5
++echo "$as_me:5727: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -5731,10 +5734,10 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:5734: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:5737: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ 
+-echo "$as_me:5737: checking if you want to check for wide-character functions" >&5
++echo "$as_me:5740: checking if you want to check for wide-character functions" >&5
+ echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -5751,10 +5754,10 @@
+ 	cf_enable_widec=yes
+ 
+ fi;
+-echo "$as_me:5754: result: $cf_enable_widec" >&5
++echo "$as_me:5757: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+ 
+-echo "$as_me:5757: checking for specific curses-directory" >&5
++echo "$as_me:5760: checking for specific curses-directory" >&5
+ echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
+ 
+ # Check whether --with-curses-dir or --without-curses-dir was given.
+@@ -5764,7 +5767,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:5767: result: $cf_cv_curses_dir" >&5
++echo "$as_me:5770: result: $cf_cv_curses_dir" >&5
+ echo "${ECHO_T}$cf_cv_curses_dir" >&6
+ 
+ if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+@@ -5795,7 +5798,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5798: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:5801: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5831,7 +5834,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 5834 "configure"
++#line 5837 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5843,16 +5846,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5846: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5849: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5849: \$? = $ac_status" >&5
++  echo "$as_me:5852: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5855: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5855: \$? = $ac_status" >&5
++  echo "$as_me:5858: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -5869,7 +5872,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:5872: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5875: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5905,7 +5908,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}:5908: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5911: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -5918,7 +5921,7 @@
+ 
+ cf_cv_screen=curses
+ 
+-echo "$as_me:5921: checking for specified curses library type" >&5
++echo "$as_me:5924: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -5962,13 +5965,13 @@
+ fi;
+ fi;
+ 
+-echo "$as_me:5965: result: $cf_cv_screen" >&5
++echo "$as_me:5968: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+ 
+ case $cf_cv_screen in
+ (curses|curses_*)
+ 
+-echo "$as_me:5971: checking for extra include directories" >&5
++echo "$as_me:5974: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5994,7 +5997,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:5997: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:6000: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -6004,7 +6007,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6007: checking if we have identified curses headers" >&5
++echo "$as_me:6010: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6016,7 +6019,7 @@
+ 	curses.h  ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6019 "configure"
++#line 6022 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -6028,16 +6031,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6031: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6034: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6034: \$? = $ac_status" >&5
++  echo "$as_me:6037: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6040: \$? = $ac_status" >&5
++  echo "$as_me:6043: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -6048,11 +6051,11 @@
+ done
+ 
+ fi
+-echo "$as_me:6051: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:6054: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:6055: error: No curses header-files found" >&5
++	{ { echo "$as_me:6058: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6062,23 +6065,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6065: checking for $ac_header" >&5
++echo "$as_me:6068: 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 6071 "configure"
++#line 6074 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:6075: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6078: \"$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:6081: \$? = $ac_status" >&5
++  echo "$as_me:6084: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6097,7 +6100,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:6100: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6103: 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 <&5
++echo "$as_me:6113: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6125,7 +6128,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6128 "configure"
++#line 6131 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6140,16 +6143,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6143: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6146: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6146: \$? = $ac_status" >&5
++  echo "$as_me:6149: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6152: \$? = $ac_status" >&5
++  echo "$as_me:6155: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -6165,7 +6168,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6168: result: $cf_cv_term_header" >&5
++echo "$as_me:6171: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6197,7 +6200,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6200: checking for ncurses version" >&5
++echo "$as_me:6203: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6223,10 +6226,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6226: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6229: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6229: \$? = $ac_status" >&5
++  echo "$as_me:6232: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -6236,7 +6239,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6239 "configure"
++#line 6242 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6261,15 +6264,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:6264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6267: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6267: \$? = $ac_status" >&5
++  echo "$as_me:6270: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:6269: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6272: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6272: \$? = $ac_status" >&5
++  echo "$as_me:6275: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6283,17 +6286,17 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:6286: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6289: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6293: checking if we have identified curses libraries" >&5
++echo "$as_me:6296: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6296 "configure"
++#line 6299 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6305,16 +6308,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6308: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6311: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6311: \$? = $ac_status" >&5
++  echo "$as_me:6314: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6317: \$? = $ac_status" >&5
++  echo "$as_me:6320: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -6323,13 +6326,13 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-echo "$as_me:6326: result: $cf_result" >&5
++echo "$as_me:6329: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case $host_os in
+ (freebsd*)
+-	echo "$as_me:6332: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:6335: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6337,7 +6340,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6340 "configure"
++#line 6343 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6356,16 +6359,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6359: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6362: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6362: \$? = $ac_status" >&5
++  echo "$as_me:6365: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6368: \$? = $ac_status" >&5
++  echo "$as_me:6371: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6376,7 +6379,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6379: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6382: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+ 
+@@ -6406,7 +6409,7 @@
+ 	# term.h) for cur_colr
+ 	if test "x$cf_cv_screen" = "xcurses_colr"
+ 	then
+-		echo "$as_me:6409: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:6412: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6414,7 +6417,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6417 "configure"
++#line 6420 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6433,16 +6436,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6439: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6439: \$? = $ac_status" >&5
++  echo "$as_me:6442: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6445: \$? = $ac_status" >&5
++  echo "$as_me:6448: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -6453,7 +6456,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6456: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:6459: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test $ac_cv_lib_cur_colr_initscr = yes; then
+ 
+@@ -6477,7 +6480,7 @@
+ 
+ else
+ 
+-		echo "$as_me:6480: checking for initscr in -lHcurses" >&5
++		echo "$as_me:6483: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6485,7 +6488,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6488 "configure"
++#line 6491 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6504,16 +6507,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6507: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6510: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6510: \$? = $ac_status" >&5
++  echo "$as_me:6513: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6516: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6516: \$? = $ac_status" >&5
++  echo "$as_me:6519: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -6524,7 +6527,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6527: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:6530: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test $ac_cv_lib_Hcurses_initscr = yes; then
+ 
+@@ -6582,7 +6585,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}:6585: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6588: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6611,7 +6614,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}:6614: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6617: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6642,7 +6645,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}:6645: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6648: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6677,7 +6680,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}:6680: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6683: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6721,13 +6724,13 @@
+ 	# because it may be needed to link the test-case for initscr.
+ 	if test "x$cf_term_lib" = x
+ 	then
+-		echo "$as_me:6724: checking for tgoto" >&5
++		echo "$as_me:6727: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6730 "configure"
++#line 6733 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6758,16 +6761,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6761: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6764: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6764: \$? = $ac_status" >&5
++  echo "$as_me:6767: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6767: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6770: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6770: \$? = $ac_status" >&5
++  echo "$as_me:6773: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_tgoto=yes
+ else
+@@ -6777,7 +6780,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6780: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:6783: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test $ac_cv_func_tgoto = yes; then
+   cf_term_lib=predefined
+@@ -6786,7 +6789,7 @@
+ 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ 			do
+ 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:6789: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:6792: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6794,7 +6797,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6797 "configure"
++#line 6800 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6813,16 +6816,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6816: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6819: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6819: \$? = $ac_status" >&5
++  echo "$as_me:6822: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6825: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6825: \$? = $ac_status" >&5
++  echo "$as_me:6828: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -6833,7 +6836,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6836: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:6839: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -6856,10 +6859,10 @@
+ 		do
+ 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+-				echo "$as_me:6859: checking if we can link with $cf_curs_lib library" >&5
++				echo "$as_me:6862: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 6862 "configure"
++#line 6865 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6871,16 +6874,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6874: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6877: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6877: \$? = $ac_status" >&5
++  echo "$as_me:6880: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6883: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6883: \$? = $ac_status" >&5
++  echo "$as_me:6886: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -6889,16 +6892,16 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-				echo "$as_me:6892: result: $cf_result" >&5
++				echo "$as_me:6895: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test $cf_result = yes && break
+ 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ 				cf_result=no
+ 			elif test "$cf_term_lib" != predefined ; then
+-				echo "$as_me:6898: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++				echo "$as_me:6901: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 6901 "configure"
++#line 6904 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6910,16 +6913,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6913: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6916: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6916: \$? = $ac_status" >&5
++  echo "$as_me:6919: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6922: \$? = $ac_status" >&5
++  echo "$as_me:6925: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=no
+ else
+@@ -6928,7 +6931,7 @@
+ 
+ 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ 					cat >conftest.$ac_ext <<_ACEOF
+-#line 6931 "configure"
++#line 6934 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6940,16 +6943,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6943: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6946: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6946: \$? = $ac_status" >&5
++  echo "$as_me:6949: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6952: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6952: \$? = $ac_status" >&5
++  echo "$as_me:6955: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -6961,13 +6964,13 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-				echo "$as_me:6964: result: $cf_result" >&5
++				echo "$as_me:6967: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test $cf_result != error && break
+ 			fi
+ 		done
+ 	fi
+-	test $cf_curs_lib = unknown && { { echo "$as_me:6970: error: no curses library found" >&5
++	test $cf_curs_lib = unknown && { { echo "$as_me:6973: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6976,7 +6979,7 @@
+ 	;;
+ (ncursesw*)
+ 
+-echo "$as_me:6979: checking for multibyte character support" >&5
++echo "$as_me:6982: 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
+@@ -6984,7 +6987,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6987 "configure"
++#line 6990 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6997,16 +7000,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7003: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7003: \$? = $ac_status" >&5
++  echo "$as_me:7006: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7009: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7009: \$? = $ac_status" >&5
++  echo "$as_me:7012: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -7018,12 +7021,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:7021: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7024: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7026 "configure"
++#line 7029 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7036,16 +7039,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7039: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7042: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7042: \$? = $ac_status" >&5
++  echo "$as_me:7045: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7048: \$? = $ac_status" >&5
++  echo "$as_me:7051: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7059,7 +7062,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7062 "configure"
++#line 7065 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7072,16 +7075,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7078: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7078: \$? = $ac_status" >&5
++  echo "$as_me:7081: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7084: \$? = $ac_status" >&5
++  echo "$as_me:7087: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7098,9 +7101,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:7101: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:7104: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:7103: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7106: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7191,7 +7194,7 @@
+ 		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}:7194: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7197: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -7199,7 +7202,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 7202 "configure"
++#line 7205 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7212,21 +7215,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7215: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7218: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7218: \$? = $ac_status" >&5
++  echo "$as_me:7221: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7221: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7224: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7224: \$? = $ac_status" >&5
++  echo "$as_me:7227: \$? = $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}:7229: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7232: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7244,7 +7247,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:7247: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7250: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -7319,13 +7322,13 @@
+ 				if test -d $cf_cv_library_path_utf8 ; then
+ 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:7322: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7325: 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 7328 "configure"
++#line 7331 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7338,21 +7341,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7341: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7344: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7344: \$? = $ac_status" >&5
++  echo "$as_me:7347: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7347: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7350: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7350: \$? = $ac_status" >&5
++  echo "$as_me:7353: \$? = $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}:7355: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7358: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -7394,7 +7397,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7397: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7400: 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
+@@ -7432,7 +7435,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 7435 "configure"
++#line 7438 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7444,16 +7447,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7447: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7450: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7450: \$? = $ac_status" >&5
++  echo "$as_me:7453: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7453: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7456: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7456: \$? = $ac_status" >&5
++  echo "$as_me:7459: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7470,7 +7473,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:7473: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7476: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7506,7 +7509,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}:7509: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7512: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7536,13 +7539,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:7539: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:7542: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:7542: result: yes" >&5
++		echo "$as_me:7545: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:7545: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:7548: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
+@@ -7675,7 +7678,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 7678 "configure"
++#line 7681 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7687,37 +7690,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7690: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7693: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7693: \$? = $ac_status" >&5
++  echo "$as_me:7696: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7699: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7699: \$? = $ac_status" >&5
++  echo "$as_me:7702: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7705 "configure"
++#line 7708 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 					int main(void)
+ 					{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7715: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7715: \$? = $ac_status" >&5
++  echo "$as_me:7718: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7717: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7720: \$? = $ac_status" >&5
++  echo "$as_me:7723: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -7863,7 +7866,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 7866 "configure"
++#line 7869 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7875,37 +7878,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7878: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7881: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7881: \$? = $ac_status" >&5
++  echo "$as_me:7884: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7887: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7887: \$? = $ac_status" >&5
++  echo "$as_me:7890: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7893 "configure"
++#line 7896 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7900: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7903: \$? = $ac_status" >&5
++  echo "$as_me:7906: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7905: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7908: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7908: \$? = $ac_status" >&5
++  echo "$as_me:7911: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -7922,7 +7925,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:7925: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:7928: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -7938,7 +7941,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:7941: checking for terminfo header" >&5
++echo "$as_me:7944: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7956,7 +7959,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7959 "configure"
++#line 7962 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7971,16 +7974,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7977: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7977: \$? = $ac_status" >&5
++  echo "$as_me:7980: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7983: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7983: \$? = $ac_status" >&5
++  echo "$as_me:7986: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7996,7 +7999,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7999: result: $cf_cv_term_header" >&5
++echo "$as_me:8002: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8031,7 +8034,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:8034: result: no" >&5
++		echo "$as_me:8037: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -8047,7 +8050,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:8050: checking for $ac_word" >&5
++echo "$as_me:8053: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8062,7 +8065,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:8065: found $ac_dir/$ac_word" >&5
++echo "$as_me:8068: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8070,10 +8073,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:8073: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:8076: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8076: result: no" >&5
++  echo "$as_me:8079: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8086,7 +8089,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:8089: checking for $ac_word" >&5
++echo "$as_me:8092: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8101,7 +8104,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:8104: found $ac_dir/$ac_word" >&5
++echo "$as_me:8107: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8109,10 +8112,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:8112: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:8115: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8115: result: no" >&5
++  echo "$as_me:8118: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8241,7 +8244,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:8244: checking if we have identified curses headers" >&5
++echo "$as_me:8247: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8253,7 +8256,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8256 "configure"
++#line 8259 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8265,16 +8268,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8268: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8271: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8271: \$? = $ac_status" >&5
++  echo "$as_me:8274: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8277: \$? = $ac_status" >&5
++  echo "$as_me:8280: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8285,11 +8288,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8288: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8291: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:8292: error: No curses header-files found" >&5
++	{ { echo "$as_me:8295: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8299,23 +8302,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8302: checking for $ac_header" >&5
++echo "$as_me:8305: 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 8308 "configure"
++#line 8311 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8312: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8315: \"$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:8318: \$? = $ac_status" >&5
++  echo "$as_me:8321: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8334,7 +8337,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:8337: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:8340: 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 <conftest.$ac_ext <<_ACEOF
+-#line 8393 "configure"
++#line 8396 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8402,16 +8405,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8405: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8408: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8408: \$? = $ac_status" >&5
++  echo "$as_me:8411: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8414: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8414: \$? = $ac_status" >&5
++  echo "$as_me:8417: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8428,7 +8431,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8431: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8434: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8447,7 +8450,7 @@
+ 
+ }
+ 
+-echo "$as_me:8450: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8453: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8459,7 +8462,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8462 "configure"
++#line 8465 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8483,16 +8486,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8486: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8489: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8489: \$? = $ac_status" >&5
++  echo "$as_me:8492: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8495: \$? = $ac_status" >&5
++  echo "$as_me:8498: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8507,14 +8510,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8510: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8513: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:8517: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8520: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8635,7 +8638,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8638 "configure"
++#line 8641 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8647,16 +8650,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8650: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8653: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8653: \$? = $ac_status" >&5
++  echo "$as_me:8656: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8656: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8659: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8659: \$? = $ac_status" >&5
++  echo "$as_me:8662: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8673,7 +8676,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8676: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8679: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8696,7 +8699,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8699 "configure"
++#line 8702 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8720,16 +8723,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8723: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8726: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8726: \$? = $ac_status" >&5
++  echo "$as_me:8729: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8729: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8732: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8732: \$? = $ac_status" >&5
++  echo "$as_me:8735: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8750,12 +8753,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8753: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8756: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8758: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8761: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
+@@ -8791,7 +8794,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8794 "configure"
++#line 8797 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8803,16 +8806,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8806: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8809: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8809: \$? = $ac_status" >&5
++  echo "$as_me:8812: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8812: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8815: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8815: \$? = $ac_status" >&5
++  echo "$as_me:8818: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8829,7 +8832,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8832: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8835: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8877,7 +8880,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:8880: checking for terminfo header" >&5
++echo "$as_me:8883: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8895,7 +8898,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8898 "configure"
++#line 8901 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8910,16 +8913,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8913: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8916: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8916: \$? = $ac_status" >&5
++  echo "$as_me:8919: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8922: \$? = $ac_status" >&5
++  echo "$as_me:8925: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8935,7 +8938,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8938: result: $cf_cv_term_header" >&5
++echo "$as_me:8941: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8973,7 +8976,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:8976: checking for ncurses version" >&5
++echo "$as_me:8979: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8999,10 +9002,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:9002: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:9005: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9005: \$? = $ac_status" >&5
++  echo "$as_me:9008: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -9012,7 +9015,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9015 "configure"
++#line 9018 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9037,15 +9040,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9040: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9043: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9043: \$? = $ac_status" >&5
++  echo "$as_me:9046: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9048: \$? = $ac_status" >&5
++  echo "$as_me:9051: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9059,7 +9062,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:9062: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9065: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9072,7 +9075,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9075: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9078: 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
+@@ -9080,7 +9083,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9083 "configure"
++#line 9086 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9099,16 +9102,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9102: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9105: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9105: \$? = $ac_status" >&5
++  echo "$as_me:9108: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9108: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9111: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9111: \$? = $ac_status" >&5
++  echo "$as_me:9114: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9119,10 +9122,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9122: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9125: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+-  echo "$as_me:9125: checking for initscr in -lgpm" >&5
++  echo "$as_me:9128: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9130,7 +9133,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9133 "configure"
++#line 9136 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9149,16 +9152,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9152: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9155: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9155: \$? = $ac_status" >&5
++  echo "$as_me:9158: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9158: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9161: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9161: \$? = $ac_status" >&5
++  echo "$as_me:9164: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9169,7 +9172,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9172: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9175: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test $ac_cv_lib_gpm_initscr = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -9184,7 +9187,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:9187: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:9190: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9192,7 +9195,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9195 "configure"
++#line 9198 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9211,16 +9214,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9214: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9217: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9217: \$? = $ac_status" >&5
++  echo "$as_me:9220: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9220: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9223: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9223: \$? = $ac_status" >&5
++  echo "$as_me:9226: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9231,7 +9234,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9234: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9237: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -9280,13 +9283,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9283: checking for initscr" >&5
++	echo "$as_me:9286: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9289 "configure"
++#line 9292 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9317,16 +9320,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9320: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9323: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9323: \$? = $ac_status" >&5
++  echo "$as_me:9326: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9329: \$? = $ac_status" >&5
++  echo "$as_me:9332: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9336,18 +9339,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9339: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9342: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test $ac_cv_func_initscr = yes; then
+   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:9346: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9349: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9350 "configure"
++#line 9353 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9359,25 +9362,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9362: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9365: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9365: \$? = $ac_status" >&5
++  echo "$as_me:9368: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9371: \$? = $ac_status" >&5
++  echo "$as_me:9374: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9373: result: yes" >&5
++  echo "$as_me:9376: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9380: result: no" >&5
++echo "$as_me:9383: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9445,11 +9448,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9448: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9451: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 9452 "configure"
++#line 9455 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9461,25 +9464,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9464: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9467: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9467: \$? = $ac_status" >&5
++  echo "$as_me:9470: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9470: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9473: \$? = $ac_status" >&5
++  echo "$as_me:9476: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9475: result: yes" >&5
++  echo "$as_me:9478: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9482: result: no" >&5
++echo "$as_me:9485: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9494,7 +9497,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:9497: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9500: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9502,7 +9505,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9505: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9508: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -9512,7 +9515,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9515 "configure"
++#line 9518 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9524,23 +9527,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9527: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9530: \$? = $ac_status" >&5
++  echo "$as_me:9533: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9536: \$? = $ac_status" >&5
++  echo "$as_me:9539: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9538: result: yes" >&5
++  echo "$as_me:9541: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9543: result: no" >&5
++echo "$as_me:9546: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9565,13 +9568,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:9568: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:9571: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:9571: result: yes" >&5
++		echo "$as_me:9574: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:9574: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:9577: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
+@@ -9704,7 +9707,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 9707 "configure"
++#line 9710 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9716,37 +9719,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9719: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9722: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9722: \$? = $ac_status" >&5
++  echo "$as_me:9725: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9725: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9728: \$? = $ac_status" >&5
++  echo "$as_me:9731: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9734 "configure"
++#line 9737 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 					int main(void)
+ 					{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9741: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9744: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9744: \$? = $ac_status" >&5
++  echo "$as_me:9747: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9749: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9749: \$? = $ac_status" >&5
++  echo "$as_me:9752: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -9892,7 +9895,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9895 "configure"
++#line 9898 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9904,37 +9907,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9907: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9910: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9910: \$? = $ac_status" >&5
++  echo "$as_me:9913: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9916: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9916: \$? = $ac_status" >&5
++  echo "$as_me:9919: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9922 "configure"
++#line 9925 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9929: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9932: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9932: \$? = $ac_status" >&5
++  echo "$as_me:9935: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9937: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9937: \$? = $ac_status" >&5
++  echo "$as_me:9940: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9951,7 +9954,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:9954: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9957: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -9967,7 +9970,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9970: checking for terminfo header" >&5
++echo "$as_me:9973: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9985,7 +9988,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9988 "configure"
++#line 9991 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10000,16 +10003,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10003: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10006: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10006: \$? = $ac_status" >&5
++  echo "$as_me:10009: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10012: \$? = $ac_status" >&5
++  echo "$as_me:10015: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10025,7 +10028,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10028: result: $cf_cv_term_header" >&5
++echo "$as_me:10031: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10060,7 +10063,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:10063: result: no" >&5
++		echo "$as_me:10066: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -10076,7 +10079,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:10079: checking for $ac_word" >&5
++echo "$as_me:10082: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10091,7 +10094,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:10094: found $ac_dir/$ac_word" >&5
++echo "$as_me:10097: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10099,10 +10102,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:10102: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:10105: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10105: result: no" >&5
++  echo "$as_me:10108: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10115,7 +10118,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:10118: checking for $ac_word" >&5
++echo "$as_me:10121: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10130,7 +10133,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:10133: found $ac_dir/$ac_word" >&5
++echo "$as_me:10136: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10138,10 +10141,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:10141: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:10144: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10144: result: no" >&5
++  echo "$as_me:10147: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10270,7 +10273,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:10273: checking if we have identified curses headers" >&5
++echo "$as_me:10276: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10282,7 +10285,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10285 "configure"
++#line 10288 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10294,16 +10297,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10297: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10300: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10300: \$? = $ac_status" >&5
++  echo "$as_me:10303: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10306: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10306: \$? = $ac_status" >&5
++  echo "$as_me:10309: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10314,11 +10317,11 @@
+ done
+ 
+ fi
+-echo "$as_me:10317: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10320: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:10321: error: No curses header-files found" >&5
++	{ { echo "$as_me:10324: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10328,23 +10331,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10331: checking for $ac_header" >&5
++echo "$as_me:10334: 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 10337 "configure"
++#line 10340 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10341: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10344: \"$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:10347: \$? = $ac_status" >&5
++  echo "$as_me:10350: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10363,7 +10366,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:10366: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:10369: 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 <conftest.$ac_ext <<_ACEOF
+-#line 10422 "configure"
++#line 10425 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10431,16 +10434,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10434: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10437: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10437: \$? = $ac_status" >&5
++  echo "$as_me:10440: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10440: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10443: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10443: \$? = $ac_status" >&5
++  echo "$as_me:10446: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10457,7 +10460,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10460: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10463: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10476,7 +10479,7 @@
+ 
+ }
+ 
+-echo "$as_me:10479: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10482: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10488,7 +10491,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10491 "configure"
++#line 10494 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10512,16 +10515,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10515: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10518: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10518: \$? = $ac_status" >&5
++  echo "$as_me:10521: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10521: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10524: \$? = $ac_status" >&5
++  echo "$as_me:10527: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -10536,14 +10539,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:10539: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10542: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:10546: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10549: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10664,7 +10667,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 10667 "configure"
++#line 10670 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10676,16 +10679,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10679: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10682: \$? = $ac_status" >&5
++  echo "$as_me:10685: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10688: \$? = $ac_status" >&5
++  echo "$as_me:10691: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10702,7 +10705,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10705: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10708: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10725,7 +10728,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10728 "configure"
++#line 10731 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10749,16 +10752,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10755: \$? = $ac_status" >&5
++  echo "$as_me:10758: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10761: \$? = $ac_status" >&5
++  echo "$as_me:10764: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -10779,12 +10782,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10782: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10785: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:10787: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:10790: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
+@@ -10820,7 +10823,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 10823 "configure"
++#line 10826 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10832,16 +10835,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10835: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10838: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10838: \$? = $ac_status" >&5
++  echo "$as_me:10841: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10844: \$? = $ac_status" >&5
++  echo "$as_me:10847: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10858,7 +10861,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10861: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10864: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10906,7 +10909,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10909: checking for terminfo header" >&5
++echo "$as_me:10912: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10924,7 +10927,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10927 "configure"
++#line 10930 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10939,16 +10942,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10942: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10945: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10945: \$? = $ac_status" >&5
++  echo "$as_me:10948: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10948: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10951: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10951: \$? = $ac_status" >&5
++  echo "$as_me:10954: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10964,7 +10967,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10967: result: $cf_cv_term_header" >&5
++echo "$as_me:10970: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11002,7 +11005,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:11005: checking for ncurses version" >&5
++echo "$as_me:11008: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11028,10 +11031,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:11031: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:11034: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11034: \$? = $ac_status" >&5
++  echo "$as_me:11037: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -11041,7 +11044,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11044 "configure"
++#line 11047 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11066,15 +11069,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:11069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11072: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11072: \$? = $ac_status" >&5
++  echo "$as_me:11075: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:11074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11077: \$? = $ac_status" >&5
++  echo "$as_me:11080: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -11088,7 +11091,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:11091: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:11094: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -11101,7 +11104,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:11104: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:11107: 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
+@@ -11109,7 +11112,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11112 "configure"
++#line 11115 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11128,16 +11131,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11134: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11134: \$? = $ac_status" >&5
++  echo "$as_me:11137: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11137: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11140: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11140: \$? = $ac_status" >&5
++  echo "$as_me:11143: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -11148,10 +11151,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11151: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:11154: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+-  echo "$as_me:11154: checking for initscr in -lgpm" >&5
++  echo "$as_me:11157: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11159,7 +11162,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11162 "configure"
++#line 11165 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11178,16 +11181,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11181: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11184: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11184: \$? = $ac_status" >&5
++  echo "$as_me:11187: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11187: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11190: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11190: \$? = $ac_status" >&5
++  echo "$as_me:11193: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -11198,7 +11201,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11201: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11204: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test $ac_cv_lib_gpm_initscr = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -11213,7 +11216,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:11216: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:11219: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11221,7 +11224,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11224 "configure"
++#line 11227 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11240,16 +11243,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11243: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11246: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11246: \$? = $ac_status" >&5
++  echo "$as_me:11249: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11252: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11252: \$? = $ac_status" >&5
++  echo "$as_me:11255: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11260,7 +11263,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11263: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11266: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -11309,13 +11312,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:11312: checking for initscr" >&5
++	echo "$as_me:11315: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11318 "configure"
++#line 11321 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11346,16 +11349,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11352: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11352: \$? = $ac_status" >&5
++  echo "$as_me:11355: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11358: \$? = $ac_status" >&5
++  echo "$as_me:11361: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -11365,18 +11368,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11368: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11371: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test $ac_cv_func_initscr = yes; then
+   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:11375: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:11378: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 11379 "configure"
++#line 11382 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11388,25 +11391,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11391: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11394: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11394: \$? = $ac_status" >&5
++  echo "$as_me:11397: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11397: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11400: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11400: \$? = $ac_status" >&5
++  echo "$as_me:11403: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:11402: result: yes" >&5
++  echo "$as_me:11405: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11409: result: no" >&5
++echo "$as_me:11412: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -11474,11 +11477,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:11477: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:11480: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 11481 "configure"
++#line 11484 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11490,25 +11493,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11493: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11496: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11496: \$? = $ac_status" >&5
++  echo "$as_me:11499: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11499: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11502: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11502: \$? = $ac_status" >&5
++  echo "$as_me:11505: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:11504: result: yes" >&5
++  echo "$as_me:11507: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11511: result: no" >&5
++echo "$as_me:11514: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -11523,7 +11526,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:11526: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:11529: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11531,7 +11534,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:11534: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:11537: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -11541,7 +11544,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11544 "configure"
++#line 11547 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11553,23 +11556,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11556: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11559: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11559: \$? = $ac_status" >&5
++  echo "$as_me:11562: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11562: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11565: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11565: \$? = $ac_status" >&5
++  echo "$as_me:11568: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:11567: result: yes" >&5
++  echo "$as_me:11570: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11572: result: no" >&5
++echo "$as_me:11575: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11589,7 +11592,7 @@
+ 
+ 	;;
+ (pdcurses)
+-	echo "$as_me:11592: checking for X" >&5
++	echo "$as_me:11595: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -11693,17 +11696,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11696 "configure"
++#line 11699 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:11700: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11703: \"$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:11706: \$? = $ac_status" >&5
++  echo "$as_me:11709: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11736,7 +11739,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11739 "configure"
++#line 11742 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11748,16 +11751,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11751: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11754: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11754: \$? = $ac_status" >&5
++  echo "$as_me:11757: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11760: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11760: \$? = $ac_status" >&5
++  echo "$as_me:11763: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -11795,7 +11798,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:11798: result: $have_x" >&5
++  echo "$as_me:11801: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -11805,7 +11808,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:11808: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:11811: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -11829,11 +11832,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:11832: checking whether -R must be followed by a space" >&5
++      echo "$as_me:11835: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >conftest.$ac_ext <<_ACEOF
+-#line 11836 "configure"
++#line 11839 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11845,16 +11848,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11848: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11851: \$? = $ac_status" >&5
++  echo "$as_me:11854: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11857: \$? = $ac_status" >&5
++  echo "$as_me:11860: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -11864,13 +11867,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:11867: result: no" >&5
++	echo "$as_me:11870: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11873 "configure"
++#line 11876 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11882,16 +11885,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11888: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11888: \$? = $ac_status" >&5
++  echo "$as_me:11891: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11894: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11894: \$? = $ac_status" >&5
++  echo "$as_me:11897: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_space=yes
+ else
+@@ -11901,11 +11904,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:11904: result: yes" >&5
++	  echo "$as_me:11907: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:11908: result: neither works" >&5
++	  echo "$as_me:11911: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -11925,7 +11928,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 11928 "configure"
++#line 11931 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11944,22 +11947,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11947: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11950: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11950: \$? = $ac_status" >&5
++  echo "$as_me:11953: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11953: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11956: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11956: \$? = $ac_status" >&5
++  echo "$as_me:11959: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11962: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:11965: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11967,7 +11970,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11970 "configure"
++#line 11973 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11986,16 +11989,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11989: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11992: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11992: \$? = $ac_status" >&5
++  echo "$as_me:11995: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11998: \$? = $ac_status" >&5
++  echo "$as_me:12001: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -12006,14 +12009,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12009: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:12012: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:12016: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:12019: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12021,7 +12024,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12024 "configure"
++#line 12027 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12040,16 +12043,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12043: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12046: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12046: \$? = $ac_status" >&5
++  echo "$as_me:12049: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12052: \$? = $ac_status" >&5
++  echo "$as_me:12055: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -12060,7 +12063,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12063: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:12066: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -12079,13 +12082,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:12082: checking for gethostbyname" >&5
++    echo "$as_me:12085: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12088 "configure"
++#line 12091 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12116,16 +12119,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12122: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12122: \$? = $ac_status" >&5
++  echo "$as_me:12125: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12128: \$? = $ac_status" >&5
++  echo "$as_me:12131: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -12135,11 +12138,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12138: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:12141: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:12142: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:12145: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12147,7 +12150,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12150 "configure"
++#line 12153 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12166,16 +12169,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12169: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12172: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12172: \$? = $ac_status" >&5
++  echo "$as_me:12175: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12175: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12178: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12178: \$? = $ac_status" >&5
++  echo "$as_me:12181: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -12186,14 +12189,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12189: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:12192: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:12196: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:12199: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12201,7 +12204,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12204 "configure"
++#line 12207 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12220,16 +12223,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12223: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12226: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12226: \$? = $ac_status" >&5
++  echo "$as_me:12229: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12232: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12232: \$? = $ac_status" >&5
++  echo "$as_me:12235: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -12240,7 +12243,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12243: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:12246: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -12256,13 +12259,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:12259: checking for connect" >&5
++    echo "$as_me:12262: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12265 "configure"
++#line 12268 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12293,16 +12296,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12296: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12299: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12299: \$? = $ac_status" >&5
++  echo "$as_me:12302: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12302: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12305: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12305: \$? = $ac_status" >&5
++  echo "$as_me:12308: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -12312,11 +12315,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12315: result: $ac_cv_func_connect" >&5
++echo "$as_me:12318: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:12319: checking for connect in -lsocket" >&5
++      echo "$as_me:12322: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12324,7 +12327,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12327 "configure"
++#line 12330 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12343,16 +12346,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12346: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12349: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12349: \$? = $ac_status" >&5
++  echo "$as_me:12352: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12352: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12355: \$? = $ac_status" >&5
++  echo "$as_me:12358: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -12363,7 +12366,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12366: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:12369: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -12372,13 +12375,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:12375: checking for remove" >&5
++    echo "$as_me:12378: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12381 "configure"
++#line 12384 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12409,16 +12412,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12412: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12415: \$? = $ac_status" >&5
++  echo "$as_me:12418: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12421: \$? = $ac_status" >&5
++  echo "$as_me:12424: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -12428,11 +12431,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12431: result: $ac_cv_func_remove" >&5
++echo "$as_me:12434: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:12435: checking for remove in -lposix" >&5
++      echo "$as_me:12438: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12440,7 +12443,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12443 "configure"
++#line 12446 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12459,16 +12462,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12462: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12465: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12465: \$? = $ac_status" >&5
++  echo "$as_me:12468: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12471: \$? = $ac_status" >&5
++  echo "$as_me:12474: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -12479,7 +12482,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12482: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:12485: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -12488,13 +12491,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:12491: checking for shmat" >&5
++    echo "$as_me:12494: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12497 "configure"
++#line 12500 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12525,16 +12528,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12531: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12531: \$? = $ac_status" >&5
++  echo "$as_me:12534: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12537: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12537: \$? = $ac_status" >&5
++  echo "$as_me:12540: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -12544,11 +12547,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12547: result: $ac_cv_func_shmat" >&5
++echo "$as_me:12550: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:12551: checking for shmat in -lipc" >&5
++      echo "$as_me:12554: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12556,7 +12559,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12559 "configure"
++#line 12562 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12575,16 +12578,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12578: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12581: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12581: \$? = $ac_status" >&5
++  echo "$as_me:12584: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12587: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12587: \$? = $ac_status" >&5
++  echo "$as_me:12590: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -12595,7 +12598,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12598: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:12601: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -12613,7 +12616,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:12616: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:12619: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12621,7 +12624,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12624 "configure"
++#line 12627 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12640,16 +12643,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12643: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12646: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12646: \$? = $ac_status" >&5
++  echo "$as_me:12649: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12652: \$? = $ac_status" >&5
++  echo "$as_me:12655: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -12660,7 +12663,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12663: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:12666: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -12672,7 +12675,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:12675: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:12678: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12683,14 +12686,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:12686: result: yes" >&5
++	echo "$as_me:12689: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12689: result: no" >&5
++	echo "$as_me:12692: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12693: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:12696: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12701,14 +12704,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3dxft
+-	echo "$as_me:12704: result: yes" >&5
++	echo "$as_me:12707: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12707: result: no" >&5
++	echo "$as_me:12710: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12711: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:12714: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12719,14 +12722,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:12722: result: yes" >&5
++	echo "$as_me:12725: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12725: result: no" >&5
++	echo "$as_me:12728: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12729: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:12732: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12737,10 +12740,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:12740: result: yes" >&5
++	echo "$as_me:12743: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12743: result: no" >&5
++	echo "$as_me:12746: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -12760,17 +12763,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
+ 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
+ 
+-echo "${as_me:-configure}:12763: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:12766: testing found package $cf_athena_pkg ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:12769: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12772: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:12773: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12776: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -12901,20 +12904,20 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:12904: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:12907: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
+ 
+-echo "$as_me:12910: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:12913: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12917 "configure"
++#line 12920 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12930,16 +12933,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12933: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12936: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12936: \$? = $ac_status" >&5
++  echo "$as_me:12939: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12939: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12942: \$? = $ac_status" >&5
++  echo "$as_me:12945: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -12949,7 +12952,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12952: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:12955: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -12961,7 +12964,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:12964: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:12967: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -12969,17 +12972,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:12972: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:12975: testing found package xmu ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:12978: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12981: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:12982: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12985: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13099,12 +13102,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13102: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:13105: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13107: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:13110: testing ...after  $LIBS ..." 1>&5
+ 
+ else
+ 	cf_pkgconfig_incs=
+@@ -13112,12 +13115,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13115: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:13118: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13120: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:13123: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -13128,7 +13131,7 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13131: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:13134: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -13153,17 +13156,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:13156: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:13159: testing found package Xext ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13162: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13165: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13166: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13169: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13284,7 +13287,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:13287: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:13290: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13292,7 +13295,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13295 "configure"
++#line 13298 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13311,16 +13314,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13314: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13317: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13317: \$? = $ac_status" >&5
++  echo "$as_me:13320: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13320: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13323: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13323: \$? = $ac_status" >&5
++  echo "$as_me:13326: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -13331,7 +13334,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13334: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:13337: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
+ 
+@@ -13367,17 +13370,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:13370: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:13373: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13376: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13379: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13380: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13383: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13497,24 +13500,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13500: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:13503: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:13507: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:13510: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13513: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13516: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13517: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13520: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13634,24 +13637,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13637: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:13640: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:13644: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:13647: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13650: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13653: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13654: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13657: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13771,24 +13774,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13774: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:13777: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:13781: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:13784: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13787: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13790: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13791: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13794: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13908,7 +13911,7 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13911: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:13914: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
+@@ -13919,17 +13922,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:13922: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:13925: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13928: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13931: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13932: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13935: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14050,14 +14053,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:14053: checking for usable X dependency" >&5
++echo "$as_me:14056: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14060 "configure"
++#line 14063 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14076,16 +14079,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14082: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14082: \$? = $ac_status" >&5
++  echo "$as_me:14085: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14088: \$? = $ac_status" >&5
++  echo "$as_me:14091: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -14095,30 +14098,30 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14098: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:14101: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ 		if test "$cf_cv_xt_x11_compat" = no
+ 		then
+ 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+ 
+-echo "${as_me:-configure}:14104: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:14107: testing work around broken X11 dependency ..." 1>&5
+ 
+ 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:14111: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14114: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14117: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14120: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14121: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14124: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14241,12 +14244,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14244: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14247: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14249: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14252: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14254,14 +14257,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:14257: checking for usable X Toolkit package" >&5
++echo "$as_me:14260: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14264 "configure"
++#line 14267 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14276,16 +14279,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14279: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14282: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14282: \$? = $ac_status" >&5
++  echo "$as_me:14285: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14288: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14288: \$? = $ac_status" >&5
++  echo "$as_me:14291: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -14295,7 +14298,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14298: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:14301: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -14309,22 +14312,22 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:14312: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:14315: testing work around broken ICE dependency ..." 1>&5
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:14317: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14320: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14323: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14326: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14327: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14330: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14443,17 +14446,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:14446: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14449: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14452: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14455: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14456: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14459: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14582,12 +14585,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14585: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14588: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14590: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14593: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14607,7 +14610,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:14610: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14613: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -14692,7 +14695,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:14695: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:14698: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14702,7 +14705,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14705: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:14708: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14712,7 +14715,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14715: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:14718: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -14721,7 +14724,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14724 "configure"
++#line 14727 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14733,16 +14736,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14736: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14739: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14739: \$? = $ac_status" >&5
++  echo "$as_me:14742: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14742: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14745: \$? = $ac_status" >&5
++  echo "$as_me:14748: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -14750,12 +14753,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:14753: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14756: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:14758: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:14761: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_flags"
+@@ -14763,13 +14766,13 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-	echo "$as_me:14766: checking for XOpenDisplay" >&5
++	echo "$as_me:14769: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14772 "configure"
++#line 14775 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14800,16 +14803,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14803: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14806: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14806: \$? = $ac_status" >&5
++  echo "$as_me:14809: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14812: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14812: \$? = $ac_status" >&5
++  echo "$as_me:14815: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -14819,13 +14822,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14822: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:14825: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test $ac_cv_func_XOpenDisplay = yes; then
+   :
+ else
+ 
+-	echo "$as_me:14828: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:14831: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14833,7 +14836,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14836 "configure"
++#line 14839 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14852,16 +14855,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14855: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14858: \$? = $ac_status" >&5
++  echo "$as_me:14861: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14861: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14864: \$? = $ac_status" >&5
++  echo "$as_me:14867: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -14872,7 +14875,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14875: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:14878: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+ 
+@@ -14896,13 +14899,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:14899: checking for XtAppInitialize" >&5
++	echo "$as_me:14902: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14905 "configure"
++#line 14908 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14933,16 +14936,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14936: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14939: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14939: \$? = $ac_status" >&5
++  echo "$as_me:14942: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14945: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14945: \$? = $ac_status" >&5
++  echo "$as_me:14948: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -14952,13 +14955,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14955: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:14958: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test $ac_cv_func_XtAppInitialize = yes; then
+   :
+ else
+ 
+-	echo "$as_me:14961: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:14964: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14966,7 +14969,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14969 "configure"
++#line 14972 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14985,16 +14988,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14988: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14991: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14991: \$? = $ac_status" >&5
++  echo "$as_me:14994: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14997: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14997: \$? = $ac_status" >&5
++  echo "$as_me:15000: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -15005,7 +15008,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15008: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:15011: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
+ 
+@@ -15022,7 +15025,7 @@
+ fi
+ 
+ if test $cf_have_X_LIBS = no ; then
+-	{ echo "$as_me:15025: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:15028: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program.  You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -15063,14 +15066,14 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+ 
+-			echo "$as_me:15066: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:15069: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ 		else
+-			echo "$as_me:15069: checking for $cf_test" >&5
++			echo "$as_me:15072: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15073 "configure"
++#line 15076 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15084,16 +15087,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15087: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15090: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15090: \$? = $ac_status" >&5
++  echo "$as_me:15093: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15096: \$? = $ac_status" >&5
++  echo "$as_me:15099: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -15102,7 +15105,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-		echo "$as_me:15105: result: $cf_result" >&5
++		echo "$as_me:15108: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -15118,7 +15121,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:15121: WARNING: Unable to find Athena header files" >&5
++	{ echo "$as_me:15124: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ 
+@@ -15183,10 +15186,10 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-		echo "$as_me:15186: checking for $cf_test in $cf_libs" >&5
++		echo "$as_me:15189: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15189 "configure"
++#line 15192 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15202,16 +15205,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15205: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15208: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15208: \$? = $ac_status" >&5
++  echo "$as_me:15211: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15214: \$? = $ac_status" >&5
++  echo "$as_me:15217: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -15220,7 +15223,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:15223: result: $cf_result" >&5
++		echo "$as_me:15226: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -15237,7 +15240,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:15240: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:15243: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -15271,7 +15274,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:15274: checking for $ac_word" >&5
++echo "$as_me:15277: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15286,7 +15289,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:15289: found $ac_dir/$ac_word" >&5
++echo "$as_me:15292: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -15294,10 +15297,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:15297: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:15300: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:15300: result: no" >&5
++  echo "$as_me:15303: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -15310,7 +15313,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:15313: checking for $ac_word" >&5
++echo "$as_me:15316: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15325,7 +15328,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:15328: found $ac_dir/$ac_word" >&5
++echo "$as_me:15331: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -15333,10 +15336,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:15336: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:15339: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:15339: result: no" >&5
++  echo "$as_me:15342: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -15471,7 +15474,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15474: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15477: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15556,7 +15559,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15559: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15562: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15566,7 +15569,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15569: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15572: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15576,7 +15579,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15579: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15582: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -15585,7 +15588,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15588 "configure"
++#line 15591 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15597,16 +15600,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15600: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15603: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15603: \$? = $ac_status" >&5
++  echo "$as_me:15606: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15606: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15609: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15609: \$? = $ac_status" >&5
++  echo "$as_me:15612: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -15614,12 +15617,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15617: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15620: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15622: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15625: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_flags"
+@@ -15627,7 +15630,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:15630: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:15633: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15635,7 +15638,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15638 "configure"
++#line 15641 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15654,16 +15657,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15657: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15660: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15660: \$? = $ac_status" >&5
++  echo "$as_me:15663: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15663: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15666: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15666: \$? = $ac_status" >&5
++  echo "$as_me:15669: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -15674,7 +15677,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15677: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:15680: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+ 
+@@ -15696,7 +15699,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15699: checking for XCurses library" >&5
++echo "$as_me:15702: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15719,7 +15722,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15722 "configure"
++#line 15725 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15734,16 +15737,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15737: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15740: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15740: \$? = $ac_status" >&5
++  echo "$as_me:15743: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15746: \$? = $ac_status" >&5
++  echo "$as_me:15749: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -15754,7 +15757,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:15757: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:15760: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -15769,23 +15772,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:15772: checking for xcurses.h" >&5
++	echo "$as_me:15775: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15778 "configure"
++#line 15781 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15782: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15785: \"$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:15788: \$? = $ac_status" >&5
++  echo "$as_me:15791: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15804,7 +15807,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15807: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:15810: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test $ac_cv_header_xcurses_h = yes; then
+ 
+@@ -15815,14 +15818,14 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:15818: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:15821: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:15825: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:15828: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -15830,7 +15833,7 @@
+ 
+ : ${cf_nculib_root:=$cf_cv_screen}
+ as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
+-echo "$as_me:15833: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
++echo "$as_me:15836: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15838,7 +15841,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_nculib_root  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15841 "configure"
++#line 15844 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15857,16 +15860,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15860: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15863: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15863: \$? = $ac_status" >&5
++  echo "$as_me:15866: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15869: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15869: \$? = $ac_status" >&5
++  echo "$as_me:15872: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -15877,7 +15880,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15880: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:15883: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   cf_cv_ncurses_pthreads=yes
+@@ -15912,7 +15915,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15915: checking for X11 rgb file" >&5
++echo "$as_me:15918: checking for X11 rgb file" >&5
+ echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
+ 
+ # Check whether --with-x11-rgb or --without-x11-rgb was given.
+@@ -15976,7 +15979,7 @@
+ 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:15979: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:15982: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -15984,7 +15987,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15987: result: $RGB_PATH" >&5
++echo "$as_me:15990: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:16031: checking for desired basename for form library" >&5
++echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
++
++# Check whether --with-form-libname or --without-form-libname was given.
++if test "${with_form_libname+set}" = set; then
++  withval="$with_form_libname"
++  with_lib_basename=$withval
++else
++  with_lib_basename=form
++fi;
++FORM_NAME="$with_lib_basename"
++
++case "x$FORM_NAME" in
++(x|xno|xnone|xyes)
++	FORM_NAME=form
++	;;
++(*)
++	;;
++esac
++
++echo "$as_me:16051: result: $FORM_NAME" >&5
++echo "${ECHO_T}$FORM_NAME" >&6
++
++echo "$as_me:16054: checking for desired basename for menu library" >&5
++echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
++
++# Check whether --with-menu-libname or --without-menu-libname was given.
++if test "${with_menu_libname+set}" = set; then
++  withval="$with_menu_libname"
++  with_lib_basename=$withval
++else
++  with_lib_basename=menu
++fi;
++MENU_NAME="$with_lib_basename"
++
++case "x$MENU_NAME" in
++(x|xno|xnone|xyes)
++	MENU_NAME=menu
++	;;
++(*)
++	;;
++esac
++
++echo "$as_me:16074: result: $MENU_NAME" >&5
++echo "${ECHO_T}$MENU_NAME" >&6
++
++echo "$as_me:16077: checking for desired basename for panel library" >&5
++echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
++
++# Check whether --with-panel-libname or --without-panel-libname was given.
++if test "${with_panel_libname+set}" = set; then
++  withval="$with_panel_libname"
++  with_lib_basename=$withval
++else
++  with_lib_basename=panel
++fi;
++PANEL_NAME="$with_lib_basename"
++
++case "x$PANEL_NAME" in
++(x|xno|xnone|xyes)
++	PANEL_NAME=panel
++	;;
++(*)
++	;;
++esac
++
++echo "$as_me:16097: result: $PANEL_NAME" >&5
++echo "${ECHO_T}$PANEL_NAME" >&6
++
++echo "$as_me:16100: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -16042,7 +16114,7 @@
+ 	cf_enable_panel=$cf_default_panel
+ 
+ fi;
+-echo "$as_me:16045: result: $cf_enable_panel" >&5
++echo "$as_me:16117: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -16053,14 +16125,14 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:16056: checking pkg-config for panel$cf_cv_libtype" >&5
+-echo $ECHO_N "checking pkg-config for panel$cf_cv_libtype... $ECHO_C" >&6
+-	if "$PKG_CONFIG" --exists panel$cf_cv_libtype ; then
+-		echo "$as_me:16059: result: yes" >&5
++	echo "$as_me:16128: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
++	if "$PKG_CONFIG" --exists $PANEL_NAME$cf_cv_libtype ; then
++		echo "$as_me:16131: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:16062: checking if the panel$cf_cv_libtype package files work" >&5
+-echo $ECHO_N "checking if the panel$cf_cv_libtype package files work... $ECHO_C" >&6
++		echo "$as_me:16134: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+ 		cf_save_LIBS="$LIBS"
+@@ -16070,7 +16142,7 @@
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in `$PKG_CONFIG --cflags panel$cf_cv_libtype`
++for cf_add_cflags in `$PKG_CONFIG --cflags $PANEL_NAME$cf_cv_libtype`
+ do
+ case $cf_fix_cppflags in
+ (no)
+@@ -16166,7 +16238,7 @@
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in `$PKG_CONFIG --libs panel$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in `$PKG_CONFIG --libs $PANEL_NAME$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -16180,9 +16252,9 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16183 "configure"
++#line 16255 "configure"
+ #include "confdefs.h"
+-#include 
++#include <$PANEL_NAME.h>
+ int
+ main (void)
+ {
+@@ -16192,37 +16264,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16195: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16267: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16198: \$? = $ac_status" >&5
++  echo "$as_me:16270: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16204: \$? = $ac_status" >&5
++  echo "$as_me:16276: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16210 "configure"
++#line 16282 "configure"
+ #include "confdefs.h"
+-#include 
++#include <$PANEL_NAME.h>
+ 				int main(void)
+ 				{ (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16217: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16289: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16220: \$? = $ac_status" >&5
++  echo "$as_me:16292: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16222: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16225: \$? = $ac_status" >&5
++  echo "$as_me:16297: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -16239,7 +16311,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:16242: result: $cf_have_curses_lib" >&5
++		echo "$as_me:16314: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" != "yes"
+@@ -16248,7 +16320,7 @@
+ 			LIBS="$cf_save_LIBS"
+ 		else
+ 
+-cf_upper=`echo "have_libpanel" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++cf_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+ 			cat >>confdefs.h <&5
+-echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
++	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
++echo "$as_me:16334: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpanel$cf_cv_libtype  $LIBS"
++LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16270 "configure"
++#line 16342 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16286,16 +16358,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16289: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16361: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16292: \$? = $ac_status" >&5
++  echo "$as_me:16364: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16367: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16298: \$? = $ac_status" >&5
++  echo "$as_me:16370: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -16306,16 +16378,16 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16309: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:16381: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+-cf_upper=`echo "have_libpanel" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++cf_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in -lpanel$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in -l$PANEL_NAME$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -16339,7 +16411,7 @@
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+-echo "$as_me:16342: checking if you want to check for menu functions" >&5
++echo "$as_me:16414: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -16356,7 +16428,7 @@
+ 	cf_enable_menu=$cf_default_menu
+ 
+ fi;
+-echo "$as_me:16359: result: $cf_enable_menu" >&5
++echo "$as_me:16431: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -16365,14 +16437,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:16368: checking for NetBSD menu.h" >&5
++echo "$as_me:16440: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16375 "configure"
++#line 16447 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -16390,16 +16462,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16393: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16396: \$? = $ac_status" >&5
++  echo "$as_me:16468: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16399: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16402: \$? = $ac_status" >&5
++  echo "$as_me:16474: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -16411,7 +16483,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16414: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:16486: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -16428,14 +16500,14 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:16431: checking pkg-config for menu$cf_cv_libtype" >&5
+-echo $ECHO_N "checking pkg-config for menu$cf_cv_libtype... $ECHO_C" >&6
+-	if "$PKG_CONFIG" --exists menu$cf_cv_libtype ; then
+-		echo "$as_me:16434: result: yes" >&5
++	echo "$as_me:16503: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
++	if "$PKG_CONFIG" --exists $MENU_NAME$cf_cv_libtype ; then
++		echo "$as_me:16506: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:16437: checking if the menu$cf_cv_libtype package files work" >&5
+-echo $ECHO_N "checking if the menu$cf_cv_libtype package files work... $ECHO_C" >&6
++		echo "$as_me:16509: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+ 		cf_save_LIBS="$LIBS"
+@@ -16445,7 +16517,7 @@
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in `$PKG_CONFIG --cflags menu$cf_cv_libtype`
++for cf_add_cflags in `$PKG_CONFIG --cflags $MENU_NAME$cf_cv_libtype`
+ do
+ case $cf_fix_cppflags in
+ (no)
+@@ -16541,7 +16613,7 @@
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in `$PKG_CONFIG --libs menu$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in `$PKG_CONFIG --libs $MENU_NAME$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -16555,9 +16627,9 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16558 "configure"
++#line 16630 "configure"
+ #include "confdefs.h"
+-#include 
++#include <$MENU_NAME.h>
+ int
+ main (void)
+ {
+@@ -16567,37 +16639,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16570: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16642: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16573: \$? = $ac_status" >&5
++  echo "$as_me:16645: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16579: \$? = $ac_status" >&5
++  echo "$as_me:16651: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16585 "configure"
++#line 16657 "configure"
+ #include "confdefs.h"
+-#include 
++#include <$MENU_NAME.h>
+ 				int main(void)
+ 				{ (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16592: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16664: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16595: \$? = $ac_status" >&5
++  echo "$as_me:16667: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16597: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16600: \$? = $ac_status" >&5
++  echo "$as_me:16672: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -16614,7 +16686,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:16617: result: $cf_have_curses_lib" >&5
++		echo "$as_me:16689: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" != "yes"
+@@ -16623,7 +16695,7 @@
+ 			LIBS="$cf_save_LIBS"
+ 		else
+ 
+-cf_upper=`echo "have_libmenu" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++cf_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+ 			cat >>confdefs.h <&5
+-echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
++	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
++echo "$as_me:16709: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmenu$cf_cv_libtype  $LIBS"
++LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16645 "configure"
++#line 16717 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16661,16 +16733,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16664: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16736: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16667: \$? = $ac_status" >&5
++  echo "$as_me:16739: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16673: \$? = $ac_status" >&5
++  echo "$as_me:16745: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -16681,16 +16753,16 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16684: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:16756: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+-cf_upper=`echo "have_libmenu" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++cf_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in -lmenu$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in -l$MENU_NAME$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -16714,7 +16786,7 @@
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+-echo "$as_me:16717: checking if you want to check for form functions" >&5
++echo "$as_me:16789: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-form or --disable-form was given.
+@@ -16731,7 +16803,7 @@
+ 	cf_enable_form=$cf_default_form
+ 
+ fi;
+-echo "$as_me:16734: result: $cf_enable_form" >&5
++echo "$as_me:16806: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -16740,14 +16812,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:16743: checking for NetBSD form.h" >&5
++echo "$as_me:16815: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16750 "configure"
++#line 16822 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -16766,16 +16838,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16769: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16841: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16772: \$? = $ac_status" >&5
++  echo "$as_me:16844: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16778: \$? = $ac_status" >&5
++  echo "$as_me:16850: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -16787,7 +16859,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16790: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:16862: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -16804,14 +16876,14 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:16807: checking pkg-config for form$cf_cv_libtype" >&5
+-echo $ECHO_N "checking pkg-config for form$cf_cv_libtype... $ECHO_C" >&6
+-	if "$PKG_CONFIG" --exists form$cf_cv_libtype ; then
+-		echo "$as_me:16810: result: yes" >&5
++	echo "$as_me:16879: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
++	if "$PKG_CONFIG" --exists $FORM_NAME$cf_cv_libtype ; then
++		echo "$as_me:16882: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:16813: checking if the form$cf_cv_libtype package files work" >&5
+-echo $ECHO_N "checking if the form$cf_cv_libtype package files work... $ECHO_C" >&6
++		echo "$as_me:16885: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+ 		cf_save_LIBS="$LIBS"
+@@ -16821,7 +16893,7 @@
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in `$PKG_CONFIG --cflags form$cf_cv_libtype`
++for cf_add_cflags in `$PKG_CONFIG --cflags $FORM_NAME$cf_cv_libtype`
+ do
+ case $cf_fix_cppflags in
+ (no)
+@@ -16917,7 +16989,7 @@
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in `$PKG_CONFIG --libs form$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in `$PKG_CONFIG --libs $FORM_NAME$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -16931,9 +17003,9 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16934 "configure"
++#line 17006 "configure"
+ #include "confdefs.h"
+-#include 
++#include <$FORM_NAME.h>
+ int
+ main (void)
+ {
+@@ -16943,37 +17015,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16946: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17018: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16949: \$? = $ac_status" >&5
++  echo "$as_me:17021: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16952: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16955: \$? = $ac_status" >&5
++  echo "$as_me:17027: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16961 "configure"
++#line 17033 "configure"
+ #include "confdefs.h"
+-#include 
++#include <$FORM_NAME.h>
+ 				int main(void)
+ 				{ (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16968: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17040: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16971: \$? = $ac_status" >&5
++  echo "$as_me:17043: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16973: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16976: \$? = $ac_status" >&5
++  echo "$as_me:17048: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -16990,7 +17062,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:16993: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17065: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" != "yes"
+@@ -16999,7 +17071,7 @@
+ 			LIBS="$cf_save_LIBS"
+ 		else
+ 
+-cf_upper=`echo "have_libform" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++cf_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+ 			cat >>confdefs.h <&5
+-echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
++	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
++echo "$as_me:17085: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lform$cf_cv_libtype  $LIBS"
++LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17021 "configure"
++#line 17093 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17037,16 +17109,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17040: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17112: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17043: \$? = $ac_status" >&5
++  echo "$as_me:17115: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17046: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17118: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17049: \$? = $ac_status" >&5
++  echo "$as_me:17121: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17057,16 +17129,16 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17060: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:17132: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+-cf_upper=`echo "have_libform" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
++cf_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+ cf_add_libs="$LIBS"
+ # reverse order
+ cf_add_0lib=
+-for cf_add_1lib in -lform$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
++for cf_add_1lib in -l$FORM_NAME$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+ # filter duplicates
+ for cf_add_1lib in $cf_add_0lib; do
+ 	for cf_add_2lib in $cf_add_libs; do
+@@ -17095,23 +17167,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17098: checking for $ac_header" >&5
++echo "$as_me:17170: 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 17104 "configure"
++#line 17176 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17108: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17180: \"$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:17114: \$? = $ac_status" >&5
++  echo "$as_me:17186: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17130,7 +17202,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17133: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17205: 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 <&5
++echo "$as_me:17215: 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 17149 "configure"
++#line 17221 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17154,13 +17226,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:17157: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17229: \"$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:17163: \$? = $ac_status" >&5
++  echo "$as_me:17235: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17182,7 +17254,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 17185 "configure"
++#line 17257 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17200,7 +17272,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 17203 "configure"
++#line 17275 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17221,7 +17293,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17224 "configure"
++#line 17296 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -17247,15 +17319,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17250: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17322: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17253: \$? = $ac_status" >&5
++  echo "$as_me:17325: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17258: \$? = $ac_status" >&5
++  echo "$as_me:17330: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -17268,7 +17340,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:17271: result: $ac_cv_header_stdc" >&5
++echo "$as_me:17343: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -17278,13 +17350,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17281: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17353: 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 17287 "configure"
++#line 17359 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17300,16 +17372,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17303: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17375: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17306: \$? = $ac_status" >&5
++  echo "$as_me:17378: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17309: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17381: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17312: \$? = $ac_status" >&5
++  echo "$as_me:17384: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17319,7 +17391,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17322: result: $ac_cv_header_time" >&5
++echo "$as_me:17394: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17343,23 +17415,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17346: checking for $ac_header" >&5
++echo "$as_me:17418: 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 17352 "configure"
++#line 17424 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17356: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17428: \"$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:17362: \$? = $ac_status" >&5
++  echo "$as_me:17434: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17378,7 +17450,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17381: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17453: 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 <&5
++echo "$as_me:17466: 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 17400 "configure"
++#line 17472 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17404: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17476: \"$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:17410: \$? = $ac_status" >&5
++  echo "$as_me:17482: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17426,7 +17498,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17429: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17501: 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 <&5
++echo "$as_me:17511: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17446,7 +17518,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17449 "configure"
++#line 17521 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -17459,16 +17531,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17534: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17465: \$? = $ac_status" >&5
++  echo "$as_me:17537: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17471: \$? = $ac_status" >&5
++  echo "$as_me:17543: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -17480,7 +17552,7 @@
+ done
+ 
+ fi
+-echo "$as_me:17483: result: $cf_cv_getopt_header" >&5
++echo "$as_me:17555: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -17505,13 +17577,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17508: checking for $ac_func" >&5
++echo "$as_me:17580: 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 17514 "configure"
++#line 17586 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17542,16 +17614,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17617: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17548: \$? = $ac_status" >&5
++  echo "$as_me:17620: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17623: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17554: \$? = $ac_status" >&5
++  echo "$as_me:17626: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17561,7 +17633,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17564: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:17636: 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 <&5
++echo "$as_me:17647: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17582 "configure"
++#line 17654 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17600,16 +17672,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17603: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17675: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17606: \$? = $ac_status" >&5
++  echo "$as_me:17678: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17609: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17612: \$? = $ac_status" >&5
++  echo "$as_me:17684: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -17619,7 +17691,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17622: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:17694: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -17629,14 +17701,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:17632: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:17704: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17639 "configure"
++#line 17711 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17657,16 +17729,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17660: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17732: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17663: \$? = $ac_status" >&5
++  echo "$as_me:17735: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17666: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17738: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17669: \$? = $ac_status" >&5
++  echo "$as_me:17741: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -17676,7 +17748,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17679: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:17751: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17686,7 +17758,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:17689: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:17761: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -17705,13 +17777,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17708: checking for $ac_func" >&5
++echo "$as_me:17780: 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 17714 "configure"
++#line 17786 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17742,16 +17814,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17817: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17748: \$? = $ac_status" >&5
++  echo "$as_me:17820: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17754: \$? = $ac_status" >&5
++  echo "$as_me:17826: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17761,7 +17833,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17764: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:17836: 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 <&5
++echo "$as_me:17848: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17781,7 +17853,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17784 "configure"
++#line 17856 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17807,16 +17879,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17810: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17882: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17813: \$? = $ac_status" >&5
++  echo "$as_me:17885: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17888: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17819: \$? = $ac_status" >&5
++  echo "$as_me:17891: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -17826,7 +17898,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17829 "configure"
++#line 17901 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -17848,16 +17920,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17923: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17854: \$? = $ac_status" >&5
++  echo "$as_me:17926: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17860: \$? = $ac_status" >&5
++  echo "$as_me:17932: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -17871,7 +17943,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:17874: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:17946: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case $cf_cv_need_xopen_extension in
+@@ -17883,7 +17955,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17886: checking for term.h" >&5
++echo "$as_me:17958: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17904,7 +17976,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17907 "configure"
++#line 17979 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17918,16 +17990,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17921: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17993: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17924: \$? = $ac_status" >&5
++  echo "$as_me:17996: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17927: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17999: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17930: \$? = $ac_status" >&5
++  echo "$as_me:18002: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -17946,7 +18018,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17949 "configure"
++#line 18021 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17964,16 +18036,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17967: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18039: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17970: \$? = $ac_status" >&5
++  echo "$as_me:18042: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17973: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17976: \$? = $ac_status" >&5
++  echo "$as_me:18048: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -17988,7 +18060,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:17991: result: $cf_cv_term_header" >&5
++echo "$as_me:18063: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case $cf_cv_term_header in
+@@ -18015,7 +18087,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18018: checking for unctrl.h" >&5
++echo "$as_me:18090: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18036,7 +18108,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18039 "configure"
++#line 18111 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18050,16 +18122,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18053: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18125: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18056: \$? = $ac_status" >&5
++  echo "$as_me:18128: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18059: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18131: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18062: \$? = $ac_status" >&5
++  echo "$as_me:18134: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -18072,12 +18144,12 @@
+ done
+ 
+ fi
+-echo "$as_me:18075: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:18147: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case $cf_cv_unctrl_header in
+ (no)
+-	{ echo "$as_me:18080: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:18152: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -18166,10 +18238,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:18169: checking for ${cf_func}" >&5
++	echo "$as_me:18241: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:18172: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:18244: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18178,7 +18250,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 18181 "configure"
++#line 18253 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -18211,16 +18283,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18214: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18286: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18217: \$? = $ac_status" >&5
++  echo "$as_me:18289: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18220: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18292: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18223: \$? = $ac_status" >&5
++  echo "$as_me:18295: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -18236,7 +18308,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:18239: result: $cf_result" >&5
++	echo "$as_me:18311: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:18326: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:18257: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:18329: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18263,7 +18335,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 18266 "configure"
++#line 18338 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -18296,16 +18368,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18299: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18371: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18302: \$? = $ac_status" >&5
++  echo "$as_me:18374: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18305: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18377: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18308: \$? = $ac_status" >&5
++  echo "$as_me:18380: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -18321,7 +18393,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:18324: result: $cf_result" >&5
++	echo "$as_me:18396: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result != no; then
+ 		cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
+-#line 18348 "configure"
++#line 18420 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18365,21 +18437,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18368: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18440: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18371: \$? = $ac_status" >&5
++  echo "$as_me:18443: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18374: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18446: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18377: \$? = $ac_status" >&5
++  echo "$as_me:18449: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:18382: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:18454: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:18474: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18409 "configure"
++#line 18481 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18421,16 +18493,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18424: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18496: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18427: \$? = $ac_status" >&5
++  echo "$as_me:18499: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18502: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18433: \$? = $ac_status" >&5
++  echo "$as_me:18505: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -18438,7 +18510,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18441 "configure"
++#line 18513 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18463,16 +18535,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18466: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18538: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18469: \$? = $ac_status" >&5
++  echo "$as_me:18541: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18544: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18475: \$? = $ac_status" >&5
++  echo "$as_me:18547: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -18486,7 +18558,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18489: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:18561: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -18500,11 +18572,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:18503: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:18575: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18507 "configure"
++#line 18579 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18517,16 +18589,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18520: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18592: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18523: \$? = $ac_status" >&5
++  echo "$as_me:18595: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18526: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18529: \$? = $ac_status" >&5
++  echo "$as_me:18601: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -18535,7 +18607,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >conftest.$ac_ext <<_ACEOF
+-#line 18538 "configure"
++#line 18610 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18548,16 +18620,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18623: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18554: \$? = $ac_status" >&5
++  echo "$as_me:18626: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18560: \$? = $ac_status" >&5
++  echo "$as_me:18632: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -18568,7 +18640,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-		echo "$as_me:18571: result: $cf_define_xpg5" >&5
++		echo "$as_me:18643: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -18577,14 +18649,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:18580: checking for wide-character functions" >&5
++	echo "$as_me:18652: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18587 "configure"
++#line 18659 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18601,16 +18673,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18604: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18676: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18607: \$? = $ac_status" >&5
++  echo "$as_me:18679: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18682: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18613: \$? = $ac_status" >&5
++  echo "$as_me:18685: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -18621,7 +18693,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18624: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:18696: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -18642,14 +18714,14 @@
+ 
+ fi
+ 
+-echo "$as_me:18645: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:18717: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18652 "configure"
++#line 18724 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18667,16 +18739,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18742: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18673: \$? = $ac_status" >&5
++  echo "$as_me:18745: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18676: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18748: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18679: \$? = $ac_status" >&5
++  echo "$as_me:18751: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -18687,21 +18759,21 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18690: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:18762: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:18697: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:18769: 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 18704 "configure"
++#line 18776 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18721,16 +18793,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18724: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18796: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18727: \$? = $ac_status" >&5
++  echo "$as_me:18799: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18802: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18733: \$? = $ac_status" >&5
++  echo "$as_me:18805: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -18742,7 +18814,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18745: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:18817: 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
+@@ -18751,7 +18823,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:18754: checking for openpty in -lutil" >&5
++echo "$as_me:18826: 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
+@@ -18759,7 +18831,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18762 "configure"
++#line 18834 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18778,16 +18850,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18781: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18853: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18784: \$? = $ac_status" >&5
++  echo "$as_me:18856: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18787: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18790: \$? = $ac_status" >&5
++  echo "$as_me:18862: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -18798,7 +18870,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18801: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:18873: 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
+@@ -18806,7 +18878,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:18809: checking for openpty header" >&5
++echo "$as_me:18881: 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
+@@ -18833,7 +18905,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18836 "configure"
++#line 18908 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18850,16 +18922,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18925: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18856: \$? = $ac_status" >&5
++  echo "$as_me:18928: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18862: \$? = $ac_status" >&5
++  echo "$as_me:18934: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -18877,7 +18949,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:18880: result: $cf_cv_func_openpty" >&5
++echo "$as_me:18952: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -18911,7 +18983,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18914: checking for function curses_version" >&5
++echo "$as_me:18986: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18921,7 +18993,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18924 "configure"
++#line 18996 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18934,15 +19006,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18937: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19009: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18940: \$? = $ac_status" >&5
++  echo "$as_me:19012: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19014: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18945: \$? = $ac_status" >&5
++  echo "$as_me:19017: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -18957,14 +19029,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:18960: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:19032: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:18967: checking for alternate character set array" >&5
++echo "$as_me:19039: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18974,7 +19046,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18977 "configure"
++#line 19049 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18990,16 +19062,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19065: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18996: \$? = $ac_status" >&5
++  echo "$as_me:19068: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19071: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19002: \$? = $ac_status" >&5
++  echo "$as_me:19074: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -19010,7 +19082,7 @@
+ done
+ 
+ fi
+-echo "$as_me:19013: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:19085: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -19020,7 +19092,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:19023: checking for wide alternate character set array" >&5
++echo "$as_me:19095: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19030,7 +19102,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19033 "configure"
++#line 19105 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19046,16 +19118,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19049: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19121: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19052: \$? = $ac_status" >&5
++  echo "$as_me:19124: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19058: \$? = $ac_status" >&5
++  echo "$as_me:19130: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -19066,7 +19138,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	done
+ fi
+-echo "$as_me:19069: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:19141: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -19074,7 +19146,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:19077: checking for wide alternate character constants" >&5
++echo "$as_me:19149: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19084,7 +19156,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19087 "configure"
++#line 19159 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19101,16 +19173,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19104: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19176: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19107: \$? = $ac_status" >&5
++  echo "$as_me:19179: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19110: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19113: \$? = $ac_status" >&5
++  echo "$as_me:19185: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -19120,7 +19192,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ else
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19123 "configure"
++#line 19195 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19136,16 +19208,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19139: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19211: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19142: \$? = $ac_status" >&5
++  echo "$as_me:19214: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19145: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19148: \$? = $ac_status" >&5
++  echo "$as_me:19220: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -19156,7 +19228,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:19159: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:19231: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -19166,10 +19238,10 @@
+ 
+ fi
+ 
+-echo "$as_me:19169: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19241: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19172 "configure"
++#line 19244 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19187,16 +19259,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19190: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19262: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19193: \$? = $ac_status" >&5
++  echo "$as_me:19265: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19196: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19199: \$? = $ac_status" >&5
++  echo "$as_me:19271: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19205,7 +19277,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19208: result: $cf_result" >&5
++echo "$as_me:19280: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19226,14 +19298,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:19229: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:19301: 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 19236 "configure"
++#line 19308 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19251,23 +19323,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19254: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19326: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19257: \$? = $ac_status" >&5
++  echo "$as_me:19329: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19332: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19263: \$? = $ac_status" >&5
++  echo "$as_me:19335: \$? = $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 19270 "configure"
++#line 19342 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19286,16 +19358,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19289: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19361: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19292: \$? = $ac_status" >&5
++  echo "$as_me:19364: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19367: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19298: \$? = $ac_status" >&5
++  echo "$as_me:19370: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -19307,7 +19379,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:19310: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:19382: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -19330,14 +19402,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:19333: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:19405: 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 19340 "configure"
++#line 19412 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19355,23 +19427,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19358: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19430: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19361: \$? = $ac_status" >&5
++  echo "$as_me:19433: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19364: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19436: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19367: \$? = $ac_status" >&5
++  echo "$as_me:19439: \$? = $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 19374 "configure"
++#line 19446 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19390,16 +19462,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19393: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19396: \$? = $ac_status" >&5
++  echo "$as_me:19468: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19399: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19402: \$? = $ac_status" >&5
++  echo "$as_me:19474: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -19411,7 +19483,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:19414: result: $cf_cv_wchar_t" >&5
++echo "$as_me:19486: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -19434,14 +19506,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:19437: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:19509: 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 19444 "configure"
++#line 19516 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19459,23 +19531,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19534: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19465: \$? = $ac_status" >&5
++  echo "$as_me:19537: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19471: \$? = $ac_status" >&5
++  echo "$as_me:19543: \$? = $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 19478 "configure"
++#line 19550 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19494,16 +19566,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19497: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19569: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19500: \$? = $ac_status" >&5
++  echo "$as_me:19572: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19575: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19506: \$? = $ac_status" >&5
++  echo "$as_me:19578: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -19515,7 +19587,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:19518: result: $cf_cv_wint_t" >&5
++echo "$as_me:19590: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -19539,10 +19611,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:19542: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19614: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19545 "configure"
++#line 19617 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19560,16 +19632,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19563: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19635: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19566: \$? = $ac_status" >&5
++  echo "$as_me:19638: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19641: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19572: \$? = $ac_status" >&5
++  echo "$as_me:19644: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19578,7 +19650,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19581: result: $cf_result" >&5
++echo "$as_me:19653: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19600,10 +19672,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:19603: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19675: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19606 "configure"
++#line 19678 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19621,16 +19693,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19624: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19696: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19627: \$? = $ac_status" >&5
++  echo "$as_me:19699: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19630: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19702: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19633: \$? = $ac_status" >&5
++  echo "$as_me:19705: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19639,7 +19711,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19642: result: $cf_result" >&5
++echo "$as_me:19714: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19661,10 +19733,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:19664: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19736: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19667 "configure"
++#line 19739 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19682,16 +19754,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19757: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19688: \$? = $ac_status" >&5
++  echo "$as_me:19760: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19763: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19694: \$? = $ac_status" >&5
++  echo "$as_me:19766: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19700,7 +19772,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19703: result: $cf_result" >&5
++echo "$as_me:19775: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19729,11 +19801,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:19732: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19804: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19736 "configure"
++#line 19808 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19766,16 +19838,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19769: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19841: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19772: \$? = $ac_status" >&5
++  echo "$as_me:19844: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19778: \$? = $ac_status" >&5
++  echo "$as_me:19850: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ 
+@@ -19785,7 +19857,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19788: result: $cf_result" >&5
++echo "$as_me:19860: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test $cf_result = yes ; then
+@@ -19797,14 +19869,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:19800: checking for data $cf_data in library" >&5
++	echo "$as_me:19872: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19807 "configure"
++#line 19879 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19843,16 +19915,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19846: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19918: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19849: \$? = $ac_status" >&5
++  echo "$as_me:19921: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19855: \$? = $ac_status" >&5
++  echo "$as_me:19927: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19864,7 +19936,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19867 "configure"
++#line 19939 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19896,15 +19968,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19899: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19971: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19902: \$? = $ac_status" >&5
++  echo "$as_me:19974: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19976: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19907: \$? = $ac_status" >&5
++  echo "$as_me:19979: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ 
+@@ -19916,7 +19988,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-	echo "$as_me:19919: result: $cf_result" >&5
++	echo "$as_me:19991: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result = yes ; then
+ 
+@@ -19933,7 +20005,7 @@
+ 
+ if ( test "$GCC" = yes || test "$GXX" = yes )
+ then
+-echo "$as_me:19936: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:20008: checking if you want to turn on gcc warnings" >&5
+ echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -19950,7 +20022,7 @@
+ 	with_warnings=no
+ 
+ fi;
+-echo "$as_me:19953: result: $with_warnings" >&5
++echo "$as_me:20025: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ if test "$with_warnings" = "yes"
+ then
+@@ -19973,10 +20045,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:19976: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:20048: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:20100: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20031: \$? = $ac_status" >&5
++  echo "$as_me:20103: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:20033: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:20105: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -20108,7 +20180,7 @@
+ done
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20111 "configure"
++#line 20183 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20123,26 +20195,26 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20126: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20198: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20129: \$? = $ac_status" >&5
++  echo "$as_me:20201: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20132: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20135: \$? = $ac_status" >&5
++  echo "$as_me:20207: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-echo "$as_me:20138: checking for X11/Xt const-feature" >&5
++echo "$as_me:20210: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20145 "configure"
++#line 20217 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -20159,16 +20231,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20162: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20165: \$? = $ac_status" >&5
++  echo "$as_me:20237: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20168: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20240: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20171: \$? = $ac_status" >&5
++  echo "$as_me:20243: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -20183,7 +20255,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:20186: result: $cf_cv_const_x_string" >&5
++echo "$as_me:20258: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -20212,7 +20284,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+  fi
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:20303: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -20244,12 +20316,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:20247: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:20319: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20250: \$? = $ac_status" >&5
++  echo "$as_me:20322: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:20252: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:20324: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -20257,7 +20329,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:20260: checking for $CC warning options..." >&5
++	{ echo "$as_me:20332: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -20281,12 +20353,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:20284: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:20356: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20287: \$? = $ac_status" >&5
++  echo "$as_me:20359: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:20289: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:20361: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Winline)
+@@ -20294,7 +20366,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:20297: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:20369: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -20304,7 +20376,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:20307: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:20379: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -20320,7 +20392,7 @@
+ fi
+ fi
+ 
+-echo "$as_me:20323: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:20395: 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.
+@@ -20337,7 +20409,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:20340: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:20412: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -20451,23 +20523,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:20454: checking for dmalloc.h" >&5
++	echo "$as_me:20526: 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 20460 "configure"
++#line 20532 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20464: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20536: \"$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:20470: \$? = $ac_status" >&5
++  echo "$as_me:20542: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20486,11 +20558,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20489: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:20561: 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:20493: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:20565: 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
+@@ -20498,7 +20570,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20501 "configure"
++#line 20573 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20517,16 +20589,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20520: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20523: \$? = $ac_status" >&5
++  echo "$as_me:20595: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20526: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20529: \$? = $ac_status" >&5
++  echo "$as_me:20601: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -20537,7 +20609,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20540: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:20612: 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 <&5
++echo "$as_me:20627: 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.
+@@ -20569,7 +20641,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:20572: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:20644: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -20683,23 +20755,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:20686: checking for dbmalloc.h" >&5
++	echo "$as_me:20758: 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 20692 "configure"
++#line 20764 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20696: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20768: \"$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:20702: \$? = $ac_status" >&5
++  echo "$as_me:20774: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20718,11 +20790,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20721: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:20793: 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:20725: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:20797: 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
+@@ -20730,7 +20802,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20733 "configure"
++#line 20805 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20749,16 +20821,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20824: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20755: \$? = $ac_status" >&5
++  echo "$as_me:20827: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20830: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20761: \$? = $ac_status" >&5
++  echo "$as_me:20833: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -20769,7 +20841,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20772: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:20844: 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 <&5
++echo "$as_me:20859: 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.
+@@ -20801,7 +20873,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:20804: result: ${with_valgrind:-no}" >&5
++echo "$as_me:20876: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -20914,7 +20986,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:20917: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:20989: 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.
+@@ -20924,7 +20996,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:20927: result: $with_no_leaks" >&5
++echo "$as_me:20999: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -20942,7 +21014,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:20945: checking for an rpath option" >&5
++	echo "$as_me:21017: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case $cf_cv_system_name in
+ 	(irix*)
+@@ -20973,12 +21045,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:20976: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:21048: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:20981: checking if we need a space after rpath option" >&5
++		echo "$as_me:21053: 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"
+ 
+@@ -20999,7 +21071,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 21002 "configure"
++#line 21074 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21011,16 +21083,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21086: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21017: \$? = $ac_status" >&5
++  echo "$as_me:21089: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21092: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21023: \$? = $ac_status" >&5
++  echo "$as_me:21095: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_space=no
+ else
+@@ -21030,14 +21102,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:21033: result: $cf_rpath_space" >&5
++		echo "$as_me:21105: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:21040: checking if rpath-hack should be disabled" >&5
++echo "$as_me:21112: checking if rpath-hack should be disabled" >&5
+ echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+@@ -21054,21 +21126,21 @@
+ 	cf_disable_rpath_hack=no
+ 
+ fi;
+-echo "$as_me:21057: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:21129: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ if test "$cf_disable_rpath_hack" = no ; then
+ 
+-echo "$as_me:21061: checking for updated LDFLAGS" >&5
++echo "$as_me:21133: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LD_RPATH_OPT" ; then
+-	echo "$as_me:21064: result: maybe" >&5
++	echo "$as_me:21136: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+ 
+ 	for ac_prog in ldd
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:21071: checking for $ac_word" >&5
++echo "$as_me:21143: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21083,7 +21155,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_cf_ldd_prog="$ac_prog"
+-echo "$as_me:21086: found $ac_dir/$ac_word" >&5
++echo "$as_me:21158: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -21091,10 +21163,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:21094: result: $cf_ldd_prog" >&5
++  echo "$as_me:21166: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:21097: result: no" >&5
++  echo "$as_me:21169: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -21108,7 +21180,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21111 "configure"
++#line 21183 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21120,16 +21192,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21123: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21195: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21126: \$? = $ac_status" >&5
++  echo "$as_me:21198: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21201: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21132: \$? = $ac_status" >&5
++  echo "$as_me:21204: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -21157,7 +21229,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:21160: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:21232: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -21169,11 +21241,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21172: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21244: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21176: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21248: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -21210,7 +21282,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:21213: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:21285: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -21223,11 +21295,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21226: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21298: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:21230: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:21302: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -21264,7 +21336,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:21267: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:21339: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -21277,14 +21349,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:21280: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:21352: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21284: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21356: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:21287: result: no" >&5
++	echo "$as_me:21359: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -21374,7 +21446,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:21377: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:21449: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -21550,7 +21622,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:21553: error: ambiguous option: $1
++    { { echo "$as_me:21625: 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;}
+@@ -21569,7 +21641,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:21572: error: unrecognized option: $1
++  -*) { { echo "$as_me:21644: 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;}
+@@ -21619,7 +21691,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
+-  *) { { echo "$as_me:21622: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:21694: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -21780,6 +21852,9 @@
+ s,@ac_ct_XCURSES_CONFIG@,$ac_ct_XCURSES_CONFIG,;t t
+ s,@RGB_PATH@,$RGB_PATH,;t t
+ s,@no_x11_rgb@,$no_x11_rgb,;t t
++s,@FORM_NAME@,$FORM_NAME,;t t
++s,@MENU_NAME@,$MENU_NAME,;t t
++s,@PANEL_NAME@,$PANEL_NAME,;t t
+ s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
+ s,@cf_ldd_prog@,$cf_ldd_prog,;t t
+ s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t
+@@ -21915,7 +21990,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:21918: creating $ac_file" >&5
++    { echo "$as_me:21993: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -21933,7 +22008,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:21936: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:22011: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -21946,7 +22021,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:21949: error: cannot find input file: $f" >&5
++           { { echo "$as_me:22024: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -21962,7 +22037,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:21965: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:22040: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -21971,7 +22046,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:21974: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:22049: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -22008,7 +22083,7 @@
+             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:22011: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:22086: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -22019,7 +22094,7 @@
+     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:22022: WARNING: Some variables may not be substituted:
++      { echo "$as_me:22097: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -22068,7 +22143,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:22071: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:22146: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -22079,7 +22154,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:22082: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:22157: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -22092,7 +22167,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:22095: error: cannot find input file: $f" >&5
++           { { echo "$as_me:22170: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -22150,7 +22225,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:22153: $ac_file is unchanged" >&5
++      { echo "$as_me:22228: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/configure.in
+Prereq:  1.157 
+--- ncurses-6.2-20200301+/test/configure.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200308/test/configure.in	2020-03-08 14:12:23.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1996-on
+ dnl
+-dnl $Id: configure.in,v 1.157 2020/02/02 23:34:34 tom Exp $
++dnl $Id: configure.in,v 1.158 2020/03/08 14:12:23 tom Exp $
+ dnl This is a simple configuration-script for the ncurses test programs that
+ dnl allows the test-directory to be separately configured against a reference
+ dnl system (i.e., sysvr4 curses)
+@@ -176,6 +176,10 @@
+ 	;;
+ esac
+ 
++CF_WITH_LIB_BASENAME(FORM_NAME,form)
++CF_WITH_LIB_BASENAME(MENU_NAME,menu)
++CF_WITH_LIB_BASENAME(PANEL_NAME,panel)
++
+ AC_MSG_CHECKING(if you want to check for panel functions)
+ CF_ARG_DISABLE(panel,
+ 	[  --disable-panel         disable checks for panel functions],
+@@ -185,7 +189,7 @@
+ AC_MSG_RESULT($cf_enable_panel)
+ if test $cf_enable_panel = yes
+ then
+-	CF_CHECK_CURSES_LIB(panel,$cf_cv_libtype,new_panel,0)
++	CF_CHECK_CURSES_LIB($PANEL_NAME,$cf_cv_libtype,new_panel,0)
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+@@ -205,7 +209,7 @@
+ 		CF_NETBSD_MENU_H
+ 		;;
+ 	esac
+-	CF_CHECK_CURSES_LIB(menu,$cf_cv_libtype,menu_driver,[0,0])
++	CF_CHECK_CURSES_LIB($MENU_NAME,$cf_cv_libtype,menu_driver,[0,0])
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+@@ -225,7 +229,7 @@
+ 		CF_NETBSD_FORM_H
+ 		;;
+ 	esac
+-	CF_CHECK_CURSES_LIB(form,$cf_cv_libtype,form_driver,[0,0])
++	CF_CHECK_CURSES_LIB($FORM_NAME,$cf_cv_libtype,form_driver,[0,0])
+ 	cf_curses_headers="$cf_curses_headers form.h"
+ fi
+ 
+Index: test/package/debian-mingw/copyright
+--- ncurses-6.2-20200301+/test/package/debian-mingw/copyright	2020-01-04 14:49:29.000000000 +0000
++++ ncurses-6.2-20200308/test/package/debian-mingw/copyright	2020-03-08 12:32:55.000000000 +0000
+@@ -4,7 +4,8 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2019,2020 Free Software Foundation, Inc.
++Copyright: 2017-2019,2020 Thomas E. Dickey
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+Index: test/package/debian-mingw64/copyright
+--- ncurses-6.2-20200301+/test/package/debian-mingw64/copyright	2020-01-04 14:49:29.000000000 +0000
++++ ncurses-6.2-20200308/test/package/debian-mingw64/copyright	2020-03-08 12:32:55.000000000 +0000
+@@ -4,7 +4,8 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2019,2020 Free Software Foundation, Inc.
++Copyright: 2017-2019,2020 Thomas E. Dickey
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+Index: test/package/debian/copyright
+--- ncurses-6.2-20200301+/test/package/debian/copyright	2020-01-04 14:49:29.000000000 +0000
++++ ncurses-6.2-20200308/test/package/debian/copyright	2020-03-08 12:32:15.000000000 +0000
+@@ -4,7 +4,8 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 1998-2019,2020 Free Software Foundation, Inc.
++Copyright: 2017-2019,2020 Thomas E. Dickey
++Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+ Files: aclocal.m4 package
+Index: test/tracemunch
+Prereq:  1.27 
+--- ncurses-6.2-20200301+/test/tracemunch	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200308/test/tracemunch	2020-03-08 12:22:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env perl
+-# $Id: tracemunch,v 1.27 2020/02/02 23:34:34 tom Exp $
++# $Id: tracemunch,v 1.28 2020/03/08 12:22:49 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+ # Copyright 1998-2005,2017 Free Software Foundation, Inc.                    #
+@@ -37,6 +37,8 @@
+ use strict;
+ use warnings;
+ 
++$| = 1;
++
+ our $putattr =
+     'PutAttrChar\(\{\{ ' . "'(.)'"
+   . ' = 0[0-7]+ \}\}\) at \(([0-9]+), ([0-9]+)\)';
+@@ -420,7 +422,10 @@
+             my $type = $known_p1{$func};
+             chomp $addr;
+             $addr =~ s/^[^(]+\((0x[[:xdigit:]]+).*/$1/i;
+-            if ( $type == 1 ) {
++            if ( $addr !~ /^0x[[:xdigit:]]+$/i ) {
++                printf "OOPS - expected type #$type, skipping\n>>$addr\n";
++            }
++            elsif ( $type == 1 ) {
+                 $scr_addr{$addr} = ++$scr_nums;
+                 $arg = &transaddr($arg);
+             }
diff --git a/ncurses-6.2-20200314.patch b/ncurses-6.2-20200314.patch
new file mode 100644
index 0000000..e5be337
--- /dev/null
+++ b/ncurses-6.2-20200314.patch
@@ -0,0 +1,773 @@
+# ncurses 6.2 - patch 20200314 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.2 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.2 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.2
+#	http://invisible-mirror.net/archives/ncurses/6.2 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200314.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Mar 15 01:36:38 UTC 2020
+# ------------------------------------------------------------------------------
+# NEWS                                  |    7 +++
+# VERSION                               |    2 -
+# dist.mk                               |    4 +-
+# doc/html/man/adacurses6-config.1.html |    2 -
+# doc/html/man/captoinfo.1m.html        |    2 -
+# doc/html/man/clear.1.html             |    2 -
+# doc/html/man/curs_printw.3x.html      |   46 ++++++++++++++++++-----
+# doc/html/man/curs_scanw.3x.html       |   64 +++++++++++++++++++++++---------
+# doc/html/man/form.3x.html             |    2 -
+# doc/html/man/infocmp.1m.html          |    2 -
+# doc/html/man/infotocap.1m.html        |    2 -
+# doc/html/man/menu.3x.html             |    2 -
+# doc/html/man/ncurses.3x.html          |   27 +++++++++++--
+# doc/html/man/ncurses6-config.1.html   |    2 -
+# doc/html/man/panel.3x.html            |    2 -
+# doc/html/man/tabs.1.html              |    2 -
+# doc/html/man/terminfo.5.html          |    2 -
+# doc/html/man/tic.1m.html              |    2 -
+# doc/html/man/toe.1m.html              |    2 -
+# doc/html/man/tput.1.html              |    2 -
+# doc/html/man/tset.1.html              |    2 -
+# man/curs_printw.3x                    |   38 ++++++++++++++++++-
+# man/curs_scanw.3x                     |   40 +++++++++++++++++++-
+# man/ncurses.3x                        |   25 ++++++++++++
+# package/debian-mingw/changelog        |    4 +-
+# package/debian-mingw64/changelog      |    4 +-
+# package/debian/changelog              |    4 +-
+# package/mingw-ncurses.nsi             |    4 +-
+# package/mingw-ncurses.spec            |    2 -
+# package/ncurses.spec                  |    2 -
+# package/ncursest.spec                 |    2 -
+# 31 files changed, 242 insertions(+), 63 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3461 
+--- ncurses-6.2-20200308+/NEWS	2020-03-08 14:28:23.000000000 +0000
++++ ncurses-6.2-20200314/NEWS	2020-03-15 00:15:32.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3461 2020/03/08 14:28:23 tom Exp $
++-- $Id: NEWS,v 1.3463 2020/03/15 00:15:32 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,11 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20200314
++	+ add history note to curs_scanw.3x for  and 
++	+ add history note to curs_printw.3x for  and 
++	+ add portability note to ncurses.3x regarding 
++
+ 20200308
+ 	+ update copyright notices in test-packages.
+ 	+ modify tracemunch to guard against errors in its known_p1 table.
+Index: VERSION
+--- ncurses-6.2-20200308+/VERSION	2020-03-08 14:28:23.000000000 +0000
++++ ncurses-6.2-20200314/VERSION	2020-03-14 15:30:00.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.2	20200308
++5:0:10	6.2	20200314
+Index: dist.mk
+Prereq:  1.1340 
+--- ncurses-6.2-20200308+/dist.mk	2020-03-08 14:28:23.000000000 +0000
++++ ncurses-6.2-20200314/dist.mk	2020-03-14 15:30:00.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1340 2020/03/08 14:28:23 tom Exp $
++# $Id: dist.mk,v 1.1341 2020/03/14 15:30:00 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 2
+-NCURSES_PATCH = 20200308
++NCURSES_PATCH = 20200314
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.2-20200308+/doc/html/man/adacurses6-config.1.html	2020-02-23 01:14:14.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/adacurses6-config.1.html	2020-03-15 00:28:07.000000000 +0000
+@@ -126,7 +126,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.2-20200308+/doc/html/man/captoinfo.1m.html	2020-02-23 01:14:14.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/captoinfo.1m.html	2020-03-15 00:28:07.000000000 +0000
+@@ -199,7 +199,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.2-20200308+/doc/html/man/clear.1.html	2020-02-23 01:14:14.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/clear.1.html	2020-03-15 00:28:08.000000000 +0000
+@@ -149,7 +149,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+ 
+Index: doc/html/man/curs_printw.3x.html
+--- ncurses-6.2-20200308+/doc/html/man/curs_printw.3x.html	2020-02-03 01:26:26.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/curs_printw.3x.html	2020-03-15 00:28:09.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_printw.3x,v 1.25 2020/02/02 23:34:34 tom Exp @
++  * @Id: curs_printw.3x,v 1.26 2020/03/14 23:48:47 tom Exp @
+ -->
+ 
+ 
+@@ -91,21 +91,48 @@
+        the window pointer is null.
+ 
+ 
++

    HISTORY

    ++       While printw was implemented in 4BSD, it was unused until 4.2BSD (which
++       used it in games).  That early version of curses was before the ANSI  C
++       standard.   It  did not use <varargs.h>, though that was available.  In
++       1991 (a couple of years after SVr4 was generally available,  and  after
++       the  C  standard  was published), other developers updated the library,
++       using <stdarg.h> internally in 4.4BSD curses.  Even with this  improve-
++       ment, BSD curses did not use function prototypes (or even declare func-
++       tions) in the <curses.h> header until 1992.
++
++       SVr2 documented printw, wprintw  tersely  as  "printf  on  stdscr"  and
++       tersely as "printf on win", respectively.
++
++       SVr3  added  mvprintw,  and mvwprintw, with a three-line summary saying
++       that they were analogous to printf(3), explaining that the string which
++       would be output from printf(3) would instead be output using waddstr on
++       the given window.  SVr3 also added vwprintw, saying that the third  pa-
++       rameter  is a va_list, defined in <varargs.h>, and referring the reader
++       to the manual pages for varargs and vprintf for detailed descriptions.
++
++       SVr4 added  no  new  variations  of  printw,  but  provided  for  using
++       <varargs.h> or <stdarg.h> to define the va_list type.
++
++       X/Open  Curses  added  vw_printw  to replace vwprintw, stating that its
++       va_list definition requires <stdarg.h>.
++
++
+

    PORTABILITY

    +-       In  this implementation, vw_printw and vwprintw are equivalent, to sup-
++       In this implementation, vw_printw and vwprintw are equivalent, to  sup-
+        port legacy applications.  However, the latter (vwprintw) is obsolete:
+ 
+-       o   The XSI Curses standard, Issue 4 described  these  functions.   The
+-           function  vwprintw is marked TO BE WITHDRAWN, and is to be replaced
++       o   The  XSI  Curses  standard, Issue 4 described these functions.  The
++           function vwprintw is marked TO BE WITHDRAWN, and is to be  replaced
+            by a function vw_printw using the <stdarg.h> interface.
+ 
+-       o   The Single Unix Specification, Version 2 states that vw_printw   is
+-           preferred   to   vwprintw   since  the  latter  requires  including
+-           <varargs.h>, which cannot be used in the same file  as  <stdarg.h>.
+-           This  implementation  uses <stdarg.h> for both, because that header
++       o   The  Single Unix Specification, Version 2 states that vw_printw  is
++           preferred  to  vwprintw  since  the   latter   requires   including
++           <varargs.h>,  which  cannot be used in the same file as <stdarg.h>.
++           This implementation uses <stdarg.h> for both, because  that  header
+            is included in <curses.h>.
+ 
+-       o   X/Open Curses, Issue 5 (December 2007) marked vwprintw (along  with
++       o   X/Open  Curses, Issue 5 (December 2007) marked vwprintw (along with
+            vwscanw and the termcap interface) as withdrawn.
+ 
+ 
+@@ -123,6 +150,7 @@
+ 
  • SYNOPSIS
    • 
+ 
  • DESCRIPTION
    • 
+ 
  • RETURN VALUE
    • 
++
  • HISTORY
    • 
+ 
  • PORTABILITY
    • 
+ 
  • SEE ALSO
    • 
+ 
+Index: doc/html/man/curs_scanw.3x.html
+--- ncurses-6.2-20200308+/doc/html/man/curs_scanw.3x.html	2020-02-03 01:26:26.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/curs_scanw.3x.html	2020-03-15 00:28:09.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scanw.3x,v 1.26 2020/02/02 23:34:34 tom Exp @
++  * @Id: curs_scanw.3x,v 1.27 2020/03/15 00:14:30 tom Exp @
+ -->
+ 
+ 
+@@ -89,41 +89,70 @@
+        the window pointer is null.
+ 
+ 
++

    HISTORY

    ++       While  scanw  was implemented in 4BSD, none of the BSD releases used it
++       until 4.4BSD (in a game).  That early version of curses was before  the
++       ANSI  C  standard.   It did not use <varargs.h>, though that was avail-
++       able.  In 1991 (a couple of years after SVr4 was  generally  available,
++       and  after  the C standard was published), other developers updated the
++       library, using <stdarg.h> internally in 4.4BSD curses.  Even with  this
++       improvement,  BSD  curses  did  not  use  function  prototypes (or even
++       declare functions) in the <curses.h> header until 1992.
++
++       SVr2 documented scanw, wscanw tersely as  "scanf  through  stdscr"  and
++       tersely as "scanf through win", respectively.
++
++       SVr3 added mvscanw, and mvwscanw, with a three-line summary saying that
++       they were analogous to scanf(3), explaining that the string which would
++       be  output  from  scanf(3) would instead be output using waddstr on the
++       given window.  SVr3 also added vwscanw, saying that the third parameter
++       is  a  va_list, defined in <varargs.h>, and referring the reader to the
++       manual  pages  for  varargs  and  vprintf  for  detailed  descriptions.
++       (Because the SVr3 documentation does not mention vscanf, that reference
++       to vprintf may not be an error).
++
++       SVr4  added  no  new  variations  of  scanw,  but  provided  for  using
++       <varargs.h> or <stdarg.h> to define the va_list type.
++
++       X/Open  Curses  added  vw_scanw  to  replace  vwscanw, stating that its
++       va_list definition requires <stdarg.h>.
++
++
+

    PORTABILITY

    +        In this implementation, vw_scanw and vwscanw are equivalent, to support
+        legacy applications.  However, the latter (vwscanw) is obsolete:
+ 
+-       o   The XSI Curses standard, Issue 4 described these functions,  noting
+-           that  the  function vwscanw is marked TO BE WITHDRAWN, and is to be
++       o   The  XSI Curses standard, Issue 4 described these functions, noting
++           that the function vwscanw is marked TO BE WITHDRAWN, and is  to  be
+            replaced by a function vw_scanw using the <stdarg.h> interface.
+ 
+-       o   The Single Unix Specification, Version 2 states that  vw_scanw   is
+-           preferred   to   vwscanw   since   the  latter  requires  including
+-           <varargs.h>, which cannot be used in the same file  as  <stdarg.h>.
+-           This  implementation  uses <stdarg.h> for both, because that header
++       o   The  Single  Unix Specification, Version 2 states that vw_scanw  is
++           preferred  to  vwscanw  since   the   latter   requires   including
++           <varargs.h>,  which  cannot be used in the same file as <stdarg.h>.
++           This implementation uses <stdarg.h> for both, because  that  header
+            is included in <curses.h>.
+ 
+-       o   X/Open Curses, Issue 5 (December 2007) marked vwscanw  (along  with
++       o   X/Open  Curses,  Issue 5 (December 2007) marked vwscanw (along with
+            vwprintw and the termcap interface) as withdrawn.
+ 
+-       Both  XSI and The Single Unix Specification, Version 2 state that these
++       Both XSI and The Single Unix Specification, Version 2 state that  these
+        functions return ERR or OK.
+ 
+-       o   Since the underlying  scanf(3)  can  return  the  number  of  items
++       o   Since  the  underlying  scanf(3)  can  return  the  number of items
+            scanned, and the SVr4 code was documented to use this feature, this
+-           is probably an editing error which was introduced  in  XSI,  rather
++           is  probably  an  editing error which was introduced in XSI, rather
+            than being done intentionally.
+ 
+-       o   This  implementation  returns the number of items scanned, for com-
+-           patibility with SVr4  curses.   As  of  2018,  NetBSD  curses  also
+-           returns  the  number  of  items  scanned.   Both ncurses and NetBSD
++       o   This implementation returns the number of items scanned,  for  com-
++           patibility  with  SVr4  curses.   As  of  2018,  NetBSD curses also
++           returns the number of  items  scanned.   Both  ncurses  and  NetBSD
+            curses call vsscanf to scan the string, which returns EOF on error.
+ 
+-       o   Portable applications should only test if the return value is  ERR,
++       o   Portable  applications should only test if the return value is ERR,
+            since the OK value (zero) is likely to be misleading.
+ 
+-           One  possible way to get useful results would be to use a "%n" con-
+-           version at the end of the format string to  ensure  that  something
++           One possible way to get useful results would be to use a "%n"  con-
++           version  at  the  end of the format string to ensure that something
+            was processed.
+ 
+ 
+@@ -141,6 +170,7 @@
+ 
  • SYNOPSIS
    • 
+ 
  • DESCRIPTION
    • 
+ 
  • RETURN VALUE
    • 
++
  • HISTORY
    • 
+ 
  • PORTABILITY
    • 
+ 
  • SEE ALSO
    • 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.2-20200308+/doc/html/man/form.3x.html	2020-02-23 01:14:18.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/form.3x.html	2020-03-15 00:28:10.000000000 +0000
+@@ -247,7 +247,7 @@
+        curses(3x)  and  related  pages  whose names begin "form_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.2-20200308+/doc/html/man/infocmp.1m.html	2020-02-23 01:14:19.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/infocmp.1m.html	2020-03-15 00:28:11.000000000 +0000
+@@ -513,7 +513,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.2-20200308+/doc/html/man/infotocap.1m.html	2020-02-23 01:14:19.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/infotocap.1m.html	2020-03-15 00:28:11.000000000 +0000
+@@ -91,7 +91,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.2-20200308+/doc/html/man/menu.3x.html	2020-02-23 01:14:19.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/menu.3x.html	2020-03-15 00:28:11.000000000 +0000
+@@ -222,7 +222,7 @@
+        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.2-20200308+/doc/html/man/ncurses.3x.html	2020-02-23 01:14:21.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/ncurses.3x.html	2020-03-15 00:28:12.000000000 +0000
+@@ -28,7 +28,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.145 2020/02/23 01:05:45 tom Exp @
++  * @Id: ncurses.3x,v 1.146 2020/03/14 23:13:18 tom Exp @
+ -->
+ 
+ 
+@@ -60,7 +60,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+@@ -1406,10 +1406,29 @@
+            ble.  That depends on the value used for _XOPEN_SOURCE feature test
+            macro.
+ 
++       o   X/Open  Curses  documents  one  required header, in a special case:
++           <stdarg.h>  before  <curses.h>  to  prototype  the  vw_printw   and
++           vw_scanw  functions  (as well as the obsolete the vwprintw and vws-
++           canw functions).  Each of those uses a va_list parameter.
++
++           The two obsolete functions were  introduced  in  SVr3.   The  other
++           functions  were  introduced  in  X/Open  Curses.   In between, SVr4
++           curses provided for  the  possibility  that  an  application  might
++           include either <varargs.h> or <stdarg.h>.  Initially, that was done
++           by using void* for the va_list parameter.  Later,  a  special  type
++           (defined  in <stdio.h>) was introduced, to allow for compiler type-
++           checking.  That special type is always available, because <stdio.h>
++           is always included by <curses.h>.
++
++           None of the X/Open Curses implementations require an application to
++           include <stdarg.h>  before  <curses.h>  because  they  either  have
++           allowed  for  a  special type, or (like ncurses) include <stdarg.h>
++           directly to provide a portable interface.
++
+ 
+

    NOTES

    +-       If  standard  output from a ncurses program is re-directed to something
+-       which is not a tty, screen updates will be directed to standard  error.
++       If standard output from a ncurses program is re-directed  to  something
++       which  is not a tty, screen updates will be directed to standard error.
+        This was an undocumented feature of AT&T System V Release 3 curses.
+ 
+ 
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.2-20200308+/doc/html/man/ncurses6-config.1.html	2020-02-23 01:14:21.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/ncurses6-config.1.html	2020-03-15 00:28:12.000000000 +0000
+@@ -113,7 +113,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.2-20200308+/doc/html/man/panel.3x.html	2020-02-23 01:14:21.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/panel.3x.html	2020-03-15 00:28:12.000000000 +0000
+@@ -281,7 +281,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.2-20200308+/doc/html/man/tabs.1.html	2020-02-23 01:14:21.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/tabs.1.html	2020-03-15 00:28:12.000000000 +0000
+@@ -206,7 +206,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.2-20200308+/doc/html/man/terminfo.5.html	2020-02-23 01:14:21.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/terminfo.5.html	2020-03-15 00:28:12.000000000 +0000
+@@ -105,7 +105,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This manual describes ncurses version 6.2 (patch 20200222).
++       This manual describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+

    Terminfo Entry Syntax

    +Index: doc/html/man/tic.1m.html
+--- ncurses-6.2-20200308+/doc/html/man/tic.1m.html	2020-02-23 01:14:21.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/tic.1m.html	2020-03-15 00:28:12.000000000 +0000
+@@ -461,7 +461,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.2-20200308+/doc/html/man/toe.1m.html	2020-02-23 01:14:21.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/toe.1m.html	2020-03-15 00:28:12.000000000 +0000
+@@ -171,7 +171,7 @@
+        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
+        minfo(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.2-20200308+/doc/html/man/tput.1.html	2020-02-23 01:14:21.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/tput.1.html	2020-03-15 00:28:12.000000000 +0000
+@@ -523,7 +523,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.2-20200308+/doc/html/man/tset.1.html	2020-02-23 01:14:22.000000000 +0000
++++ ncurses-6.2-20200314/doc/html/man/tset.1.html	2020-03-15 00:28:12.000000000 +0000
+@@ -390,7 +390,7 @@
+        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.2 (patch 20200222).
++       This describes ncurses version 6.2 (patch 20200314).
+ 
+ 
+ 
+Index: man/curs_printw.3x
+Prereq:  1.25 
+--- ncurses-6.2-20200308+/man/curs_printw.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200314/man/curs_printw.3x	2020-03-14 23:48:47.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_printw.3x,v 1.25 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_printw.3x,v 1.26 2020/03/14 23:48:47 tom Exp $
+ .TH curs_printw 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -89,6 +89,42 @@
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
++.SH HISTORY
++While \fBprintw\fP was implemented in 4BSD,
++it was unused until 4.2BSD (which used it in games).
++That early version of curses was before the ANSI C standard.
++It did not use , though that was available.
++In 1991 (a couple of years after SVr4 was generally available,
++and after the C standard was published),
++other developers updated the library,
++using  internally in 4.4BSD curses.
++Even with this improvement,
++BSD curses did not use function prototypes (or even declare
++functions) in the  header until 1992.
++.PP
++SVr2 documented
++\fBprintw\fP,
++\fBwprintw\fP
++tersely as \*(``printf on \fIstdscr\fP\*('' and
++tersely as \*(``printf on \fIwin\fP\*('', respectively.
++.PP
++SVr3 added
++\fBmvprintw\fP, and
++\fBmvwprintw\fP, with a three-line summary saying that they were analogous
++to \fBprintf\fP(3),
++explaining that the string which would be output from \fBprintf\fP(3) would
++instead be output using \fBwaddstr\fP on the given window.
++SVr3 also added \fBvwprintw\fP, saying that the third parameter
++is a \fBva_list\fP, defined in ,
++and referring the reader to the manual pages for \fIvarargs\fP and
++\fIvprintf\fP for detailed descriptions.
++.PP
++SVr4 added no new variations of \fBprintw\fP,
++but provided for using  or  to define the \fBva_list\fP
++type.
++.PP
++X/Open Curses added \fBvw_printw\fP to replace \fBvwprintw\fP,
++stating that its \fBva_list\fP definition requires .
+ .SH PORTABILITY
+ In this implementation, \fBvw_printw\fP and \fBvwprintw\fP are equivalent,
+ to support legacy applications.
+Index: man/curs_scanw.3x
+Prereq:  1.26 
+--- ncurses-6.2-20200308+/man/curs_scanw.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200314/man/curs_scanw.3x	2020-03-15 00:14:30.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scanw.3x,v 1.26 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_scanw.3x,v 1.27 2020/03/15 00:14:30 tom Exp $
+ .TH curs_scanw 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -83,6 +83,44 @@
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
++.SH HISTORY
++While \fBscanw\fP was implemented in 4BSD,
++none of the BSD releases used it until 4.4BSD (in a game).
++That early version of curses was before the ANSI C standard.
++It did not use , though that was available.
++In 1991 (a couple of years after SVr4 was generally available,
++and after the C standard was published),
++other developers updated the library,
++using  internally in 4.4BSD curses.
++Even with this improvement,
++BSD curses did not use function prototypes (or even declare
++functions) in the  header until 1992.
++.PP
++SVr2 documented
++\fBscanw\fP,
++\fBwscanw\fP
++tersely as \*(``scanf through \fIstdscr\fP\*('' and
++tersely as \*(``scanf through \fIwin\fP\*('', respectively.
++.PP
++SVr3 added
++\fBmvscanw\fP, and
++\fBmvwscanw\fP, with a three-line summary saying that they were analogous
++to \fBscanf\fP(3),
++explaining that the string which would be output from \fBscanf\fP(3) would
++instead be output using \fBwaddstr\fP on the given window.
++SVr3 also added \fBvwscanw\fP, saying that the third parameter
++is a \fBva_list\fP, defined in ,
++and referring the reader to the manual pages for \fIvarargs\fP and
++\fIvprintf\fP for detailed descriptions.
++(Because the SVr3 documentation does not mention \fIvscanf\fP,
++that reference to \fIvprintf\fP may not be an error).
++.PP
++SVr4 added no new variations of \fBscanw\fP,
++but provided for using  or  to define the \fBva_list\fP
++type.
++.PP
++X/Open Curses added \fBvw_scanw\fP to replace \fBvwscanw\fP,
++stating that its \fBva_list\fP definition requires .
+ .SH PORTABILITY
+ In this implementation, \fBvw_scanw\fP and \fBvwscanw\fP are equivalent,
+ to support legacy applications.
+Index: man/ncurses.3x
+Prereq:  1.145 
+--- ncurses-6.2-20200308+/man/ncurses.3x	2020-02-23 01:05:45.000000000 +0000
++++ ncurses-6.2-20200314/man/ncurses.3x	2020-03-14 23:13:18.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.145 2020/02/23 01:05:45 tom Exp $
++.\" $Id: ncurses.3x,v 1.146 2020/03/14 23:13:18 tom Exp $
+ .hy 0
+ .TH ncurses 3X ""
+ .ie \n(.g .ds `` \(lq
+@@ -1483,6 +1483,29 @@
+ If the header is included, its symbols may be made visible.
+ That depends on the value used for \fB_XOPEN_SOURCE\fP
+ feature test macro.
++.bP
++X/Open Curses documents one required header,
++in a special case:  before  to prototype
++the \fBvw_printw\fP and \fBvw_scanw\fP functions
++(as well as the obsolete
++the \fBvwprintw\fP and \fBvwscanw\fP functions).
++Each of those uses a \fBva_list\fP parameter.
++.IP
++The two obsolete functions were introduced in SVr3.
++The other functions were introduced in X/Open Curses.
++In between, SVr4 curses provided for the possibility that
++an application might include either  or .
++Initially, that was done by using \fBvoid*\fP for the \fBva_list\fP
++parameter.
++Later, a special type (defined in ) was introduced,
++to allow for compiler type-checking.
++That special type is always available,
++because  is always included by .
++.IP
++None of the X/Open Curses implementations require an application
++to include  before  because they either
++have allowed for a special type, or (like ncurses) include 
++directly to provide a portable interface.
+ .SH NOTES
+ .PP
+ If standard output from a \fBncurses\fR program is re-directed to something
+Index: package/debian-mingw/changelog
+--- ncurses-6.2-20200308+/package/debian-mingw/changelog	2020-03-08 14:28:23.000000000 +0000
++++ ncurses-6.2-20200314/package/debian-mingw/changelog	2020-03-14 15:30:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200308) unstable; urgency=low
++ncurses6 (6.2+20200314) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 08 Mar 2020 10:28:23 -0400
++ -- Thomas E. Dickey   Sat, 14 Mar 2020 11:30:00 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.2-20200308+/package/debian-mingw64/changelog	2020-03-08 14:28:23.000000000 +0000
++++ ncurses-6.2-20200314/package/debian-mingw64/changelog	2020-03-14 15:30:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200308) unstable; urgency=low
++ncurses6 (6.2+20200314) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 08 Mar 2020 10:28:23 -0400
++ -- Thomas E. Dickey   Sat, 14 Mar 2020 11:30:00 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.2-20200308+/package/debian/changelog	2020-03-08 14:28:23.000000000 +0000
++++ ncurses-6.2-20200314/package/debian/changelog	2020-03-14 15:30:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200308) unstable; urgency=low
++ncurses6 (6.2+20200314) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 08 Mar 2020 10:28:23 -0400
++ -- Thomas E. Dickey   Sat, 14 Mar 2020 11:30:00 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.384 
+--- ncurses-6.2-20200308+/package/mingw-ncurses.nsi	2020-03-08 14:28:23.000000000 +0000
++++ ncurses-6.2-20200314/package/mingw-ncurses.nsi	2020-03-14 15:30:00.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.384 2020/03/08 14:28:23 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.385 2020/03/14 15:30:00 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "2"
+ !define VERSION_YYYY  "2020"
+-!define VERSION_MMDD  "0308"
++!define VERSION_MMDD  "0314"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.2-20200308+/package/mingw-ncurses.spec	2020-03-08 14:28:23.000000000 +0000
++++ ncurses-6.2-20200314/package/mingw-ncurses.spec	2020-03-14 15:30:00.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.2
+-Release: 20200308
++Release: 20200314
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.2-20200308+/package/ncurses.spec	2020-03-08 14:28:23.000000000 +0000
++++ ncurses-6.2-20200314/package/ncurses.spec	2020-03-14 15:30:00.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.2
+-Release: 20200308
++Release: 20200314
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.2-20200308+/package/ncursest.spec	2020-03-08 14:28:23.000000000 +0000
++++ ncurses-6.2-20200314/package/ncursest.spec	2020-03-14 15:30:00.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.2
+-Release: 20200308
++Release: 20200314
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/ncurses-6.2-20200321.patch b/ncurses-6.2-20200321.patch
new file mode 100644
index 0000000..0a65f62
--- /dev/null
+++ b/ncurses-6.2-20200321.patch
@@ -0,0 +1,23786 @@
+# ncurses 6.2 - patch 20200321 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.2 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.2 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.2
+#	http://invisible-mirror.net/archives/ncurses/6.2 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200321.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Mar 22 01:09:36 UTC 2020
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                       |   54 
+# Ada95/configure                        | 1050 ++++++------
+# MANIFEST                               |    2 
+# NEWS                                   |    9 
+# VERSION                                |    2 
+# aclocal.m4                             |   60 
+# configure                              | 2358 +++++++++++++--------------
+# dist.mk                                |    4 
+# doc/html/man/adacurses6-config.1.html  |    2 
+# doc/html/man/captoinfo.1m.html         |    2 
+# doc/html/man/clear.1.html              |    2 
+# doc/html/man/curs_add_wch.3x.html      |   75 
+# doc/html/man/curs_addch.3x.html        |   87 
+# doc/html/man/curs_addstr.3x.html       |   22 
+# doc/html/man/form.3x.html              |    2 
+# doc/html/man/infocmp.1m.html           |    2 
+# doc/html/man/infotocap.1m.html         |    2 
+# doc/html/man/menu.3x.html              |    2 
+# doc/html/man/ncurses.3x.html           |   10 
+# doc/html/man/ncurses6-config.1.html    |    2 
+# doc/html/man/panel.3x.html             |    2 
+# doc/html/man/tabs.1.html               |    2 
+# doc/html/man/terminfo.5.html           |    2 
+# doc/html/man/tic.1m.html               |    2 
+# doc/html/man/toe.1m.html               |    2 
+# doc/html/man/tput.1.html               |    2 
+# doc/html/man/tset.1.html               |    2 
+# man/curs_add_wch.3x                    |   21 
+# man/curs_addch.3x                      |   15 
+# man/curs_addstr.3x                     |   18 
+# man/ncurses.3x                         |    9 
+# ncurses-6.2-20200321/test/dup_field.c  |  394 ++++
+# ncurses-6.2-20200321/test/move_field.c |  515 +++++
+# package/debian-mingw/changelog         |    4 
+# package/debian-mingw64/changelog       |    4 
+# package/debian/changelog               |    4 
+# package/mingw-ncurses.nsi              |    4 
+# package/mingw-ncurses.spec             |    2 
+# package/ncurses.spec                   |    2 
+# package/ncursest.spec                  |    2 
+# test/Makefile.in                       |   17 
+# test/README                            |  128 -
+# test/aclocal.m4                        |   86 
+# test/configure                         | 2704 +++++++++++++++----------------
+# test/demo_forms.c                      |   32 
+# test/modules                           |   12 
+# test/programs                          |    4 
+# 47 files changed, 4423 insertions(+), 3317 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.154 
+--- ncurses-6.2-20200314+/Ada95/aclocal.m4	2020-02-27 10:21:59.000000000 +0000
++++ ncurses-6.2-20200321/Ada95/aclocal.m4	2020-03-20 00:23:48.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.154 2020/02/27 10:21:59 tom Exp $
++dnl $Id: aclocal.m4,v 1.155 2020/03/20 00:23:48 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -729,7 +729,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CONST_X_STRING version: 3 updated: 2020/01/11 18:39:22
++dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47
+ dnl -----------------
+ dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
+ dnl character-strings.
+@@ -759,7 +759,7 @@
+ #include 
+ #include 
+ ],
+-[String foo = malloc(1)],[
++[String foo = malloc(1); (void)foo],[
+ 
+ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
+ 	AC_TRY_COMPILE(
+@@ -789,7 +789,7 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CONST_X_STRING version: 3 updated: 2020/01/11 18:39:22
++dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47
+ dnl -----------------
+ dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
+ dnl character-strings.
+@@ -819,7 +819,7 @@
+ #include 
+ #include 
+ ],
+-[String foo = malloc(1)],[
++[String foo = malloc(1); (void)foo],[
+ 
+ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
+ 	AC_TRY_COMPILE(
+@@ -1151,7 +1151,7 @@
+ 	AC_MSG_RESULT($ADAFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00
++dnl CF_GCC_ATTRIBUTES version: 18 updated: 2020/03/10 18:53:47
+ dnl -----------------
+ dnl Test for availability of useful gcc __attribute__ directives to quiet
+ dnl compiler warnings.  Though useful, not all are supported -- and contrary
+@@ -1195,7 +1195,7 @@
+ extern void wow(char *,...) GCC_SCANFLIKE(1,2);
+ extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
+ extern void foo(void) GCC_NORETURN;
+-int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { return 0; }
++int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { (void)argc; (void)argv; return 0; }
+ EOF
+ 	cf_printf_attribute=no
+ 	cf_scanf_attribute=no
+@@ -1974,7 +1974,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LARGEFILE version: 11 updated: 2018/06/20 20:23:13
++dnl CF_LARGEFILE version: 12 updated: 2020/03/19 20:23:48
+ dnl ------------
+ dnl Add checks for large file support.
+ AC_DEFUN([CF_LARGEFILE],[
+@@ -2014,6 +2014,7 @@
+ 		struct dirent64 *x = readdir((DIR *)0);
+ 		struct dirent *y = readdir((DIR *)0);
+ 		int z = x - y;
++		(void)z;
+ 		],
+ 		[cf_cv_struct_dirent64=yes],
+ 		[cf_cv_struct_dirent64=no])
+@@ -3493,7 +3494,7 @@
+ done
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SHARED_OPTS version: 93 updated: 2018/08/18 16:36:35
++dnl CF_SHARED_OPTS version: 94 updated: 2020/02/29 16:09:19
+ dnl --------------
+ dnl --------------
+ dnl Attempt to determine the appropriate CC/LD options for creating a shared
+@@ -3719,6 +3720,37 @@
+ 		CF_SHARED_SONAME
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+ 		;;
++	(mingw*msvc*)
++		cf_cv_shlib_version=mingw
++		cf_cv_shlib_version_infix=mingw
++		shlibdir=$bindir
++		MAKE_DLLS=
++		if test "$DFT_LWR_MODEL" = "shared" ; then
++			LOCAL_LDFLAGS="-link -dll"
++			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
++			EXTRA_LDFLAGS="-link -dll $EXTRA_LDFLAGS"
++		fi
++		CC_SHARED_OPTS=
++		MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh $@ ${LD} ${CFLAGS}'
++		RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
++		cat >mk_shared_lib.sh <<-CF_EOF
++		#!$SHELL
++		SHARED_LIB=\$1
++		IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$\.dll.a/'\`
++		shift
++		my_ld=\$1
++		shift
++		cat <<-EOF
++		Linking shared library
++		** SHARED LIB \$SHARED_LIB
++		** IMPORT_LIB \$IMPORT_LIB
++EOF
++		args=\$(echo \$* | sed -E "s#-l(\w*)#lib\1.a#g" | sed -E "s#-L(\w*)#-LIBPATH:\1#g")
++		exec \$my_ld -DLL -IMPLIB:"\${IMPORT_LIB}" -OUT:"\${SHARED_LIB}" ${LDFLAGS} \$args
++		mv "\${IMPORT_LIB}" "\${IMPORT_LIB}"
++CF_EOF
++		chmod +x mk_shared_lib.sh
++		;;
+ 	(mingw*)
+ 		cf_cv_shlib_version=mingw
+ 		cf_cv_shlib_version_infix=mingw
+@@ -3984,7 +4016,7 @@
+ done
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_TERM_HEADER version: 4 updated: 2015/04/15 19:08:48
++dnl CF_TERM_HEADER version: 5 updated: 2020/03/19 20:23:48
+ dnl --------------
+ dnl Look for term.h, which is part of X/Open curses.  It defines the interface
+ dnl to terminfo database.  Usually it is in the same include-path as curses.h,
+@@ -4005,7 +4037,7 @@
+ AC_TRY_COMPILE([#include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ #include <$cf_test>
+-],[int x = auto_left_margin],[
++],[int x = auto_left_margin; (void)x],[
+ 	cf_cv_term_header="$cf_test"],[
+ 	cf_cv_term_header=unknown
+ 	])
+Index: Ada95/configure
+--- ncurses-6.2-20200314+/Ada95/configure	2020-02-27 10:21:59.000000000 +0000
++++ ncurses-6.2-20200321/Ada95/configure	2020-03-22 00:32:10.000000000 +0000
+@@ -4570,7 +4570,7 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+@@ -5509,7 +5509,7 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+@@ -7166,7 +7166,7 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+@@ -8113,7 +8113,7 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+@@ -9202,7 +9202,7 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+@@ -10141,7 +10141,7 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+@@ -11289,6 +11289,37 @@
+ 
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+ 		;;
++	(mingw*msvc*)
++		cf_cv_shlib_version=mingw
++		cf_cv_shlib_version_infix=mingw
++		shlibdir=$bindir
++		MAKE_DLLS=
++		if test "$DFT_LWR_MODEL" = "shared" ; then
++			LOCAL_LDFLAGS="-link -dll"
++			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
++			EXTRA_LDFLAGS="-link -dll $EXTRA_LDFLAGS"
++		fi
++		CC_SHARED_OPTS=
++		MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh  ${LD} ${CFLAGS}'
++		RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
++		cat >mk_shared_lib.sh <<-CF_EOF
++		#!$SHELL
++		SHARED_LIB=\
++		IMPORT_LIB=\`echo "\" | sed -e 's/0-9*\.dll$\.dll.a/'\`
++		shift
++		my_ld=\
++		shift
++		cat <<-EOF
++		Linking shared library
++		** SHARED LIB \$SHARED_LIB
++		** IMPORT_LIB \$IMPORT_LIB
++EOF
++		args=\$(echo \ | sed -E "s#-l(\w*)#lib\1.a#g" | sed -E "s#-L(\w*)#-LIBPATH:\1#g")
++		exec \$my_ld -DLL -IMPLIB:"\${IMPORT_LIB}" -OUT:"\${SHARED_LIB}" ${LDFLAGS} \$args
++		mv "\${IMPORT_LIB}" "\${IMPORT_LIB}"
++CF_EOF
++		chmod +x mk_shared_lib.sh
++		;;
+ 	(mingw*)
+ 		cf_cv_shlib_version=mingw
+ 		cf_cv_shlib_version_infix=mingw
+@@ -11446,7 +11477,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 11449 "configure"
++#line 11480 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11458,16 +11489,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11461: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11492: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11464: \$? = $ac_status" >&5
++  echo "$as_me:11495: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11467: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11470: \$? = $ac_status" >&5
++  echo "$as_me:11501: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -11504,7 +11535,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:11507: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:11538: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -11514,7 +11545,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -11526,18 +11557,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:11529: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:11560: checking if CFLAGS option -$cf_opt works" >&5
+ echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
+-			if { (eval echo "$as_me:11531: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:11562: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11534: \$? = $ac_status" >&5
++  echo "$as_me:11565: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-				echo "$as_me:11536: result: yes" >&5
++				echo "$as_me:11567: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:11540: result: no" >&5
++				echo "$as_me:11571: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -11552,17 +11583,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:11555: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:11586: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:11559: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:11590: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ # The test/sample programs in the original tree link using rpath option.
+ # Make it optional for packagers.
+ if test -n "$LOCAL_LDFLAGS"
+ then
+-	echo "$as_me:11565: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:11596: checking if you want to link sample programs with rpath option" >&5
+ echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-link or --disable-rpath-link was given.
+@@ -11572,7 +11603,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:11575: result: $with_rpath_link" >&5
++	echo "$as_me:11606: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -11585,7 +11616,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:11588: checking if you want broken-linker support code" >&5
++echo "$as_me:11619: 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.
+@@ -11595,7 +11626,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:11598: result: $with_broken_linker" >&5
++echo "$as_me:11629: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : ${BROKEN_LINKER:=0}
+@@ -11610,14 +11641,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:11613: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:11644: checking if the POSIX test-macros are already defined" >&5
+ echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+ if test "${cf_cv_posix_visible+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11620 "configure"
++#line 11651 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11636,16 +11667,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11639: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11670: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11642: \$? = $ac_status" >&5
++  echo "$as_me:11673: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11645: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11676: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11648: \$? = $ac_status" >&5
++  echo "$as_me:11679: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -11656,7 +11687,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11659: result: $cf_cv_posix_visible" >&5
++echo "$as_me:11690: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -11701,14 +11732,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:11704: checking if this is the GNU C library" >&5
++echo "$as_me:11735: checking if this is the GNU C library" >&5
+ echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11711 "configure"
++#line 11742 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11727,16 +11758,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11730: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11761: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11733: \$? = $ac_status" >&5
++  echo "$as_me:11764: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11736: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11767: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11739: \$? = $ac_status" >&5
++  echo "$as_me:11770: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -11747,7 +11778,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11750: result: $cf_cv_gnu_library" >&5
++echo "$as_me:11781: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -11755,7 +11786,7 @@
+ 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+ 	# was changed to help a little.  newlib incorporated the change about 4
+ 	# years later.
+-	echo "$as_me:11758: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:11789: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+ echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11767,7 +11798,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 11770 "configure"
++#line 11801 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11786,16 +11817,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11789: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11820: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11792: \$? = $ac_status" >&5
++  echo "$as_me:11823: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11826: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11798: \$? = $ac_status" >&5
++  echo "$as_me:11829: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -11807,12 +11838,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:11810: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:11841: result: $cf_cv_gnu_library_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+ 
+ 	if test "x$cf_cv_gnu_library_219" = xyes; then
+ 		cf_save="$CPPFLAGS"
+-		echo "$as_me:11815: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:11846: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11917,7 +11948,7 @@
+ fi
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 11920 "configure"
++#line 11951 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -11937,16 +11968,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11940: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11971: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11943: \$? = $ac_status" >&5
++  echo "$as_me:11974: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11946: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11977: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11949: \$? = $ac_status" >&5
++  echo "$as_me:11980: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -11957,7 +11988,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:11960: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11991: result: $cf_cv_gnu_dftsrc_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+ 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+ 	else
+@@ -11966,14 +11997,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:11969: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:12000: 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 11976 "configure"
++#line 12007 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11988,16 +12019,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11991: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12022: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11994: \$? = $ac_status" >&5
++  echo "$as_me:12025: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12000: \$? = $ac_status" >&5
++  echo "$as_me:12031: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -12104,7 +12135,7 @@
+ fi
+ 
+ 			 cat >conftest.$ac_ext <<_ACEOF
+-#line 12107 "configure"
++#line 12138 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12119,16 +12150,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12122: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12153: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12125: \$? = $ac_status" >&5
++  echo "$as_me:12156: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12159: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12131: \$? = $ac_status" >&5
++  echo "$as_me:12162: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -12143,12 +12174,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12146: result: $cf_cv_gnu_source" >&5
++echo "$as_me:12177: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ 
+ 		if test "$cf_cv_gnu_source" = yes
+ 		then
+-		echo "$as_me:12151: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:12182: checking if we should also define _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_default_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12158,7 +12189,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 12161 "configure"
++#line 12192 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12173,16 +12204,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12176: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12207: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12179: \$? = $ac_status" >&5
++  echo "$as_me:12210: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12185: \$? = $ac_status" >&5
++  echo "$as_me:12216: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -12193,7 +12224,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12196: result: $cf_cv_default_source" >&5
++echo "$as_me:12227: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -12230,16 +12261,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:12233: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:12264: 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}:12239: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:12270: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 12242 "configure"
++#line 12273 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12254,16 +12285,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12257: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12288: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12260: \$? = $ac_status" >&5
++  echo "$as_me:12291: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12266: \$? = $ac_status" >&5
++  echo "$as_me:12297: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -12284,7 +12315,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 12287 "configure"
++#line 12318 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12299,16 +12330,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12302: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12333: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12305: \$? = $ac_status" >&5
++  echo "$as_me:12336: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12308: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12339: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12311: \$? = $ac_status" >&5
++  echo "$as_me:12342: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12319,7 +12350,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:12322: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12353: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -12327,10 +12358,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:12330: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:12361: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 12333 "configure"
++#line 12364 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12345,16 +12376,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12348: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12379: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12351: \$? = $ac_status" >&5
++  echo "$as_me:12382: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12357: \$? = $ac_status" >&5
++  echo "$as_me:12388: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12370,7 +12401,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12373: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:12404: 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
+@@ -12510,14 +12541,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:12513: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12544: 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 12520 "configure"
++#line 12551 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12536,16 +12567,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12539: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12570: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12542: \$? = $ac_status" >&5
++  echo "$as_me:12573: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12548: \$? = $ac_status" >&5
++  echo "$as_me:12579: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12557,7 +12588,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 12560 "configure"
++#line 12591 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12576,16 +12607,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12579: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12610: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12582: \$? = $ac_status" >&5
++  echo "$as_me:12613: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12585: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12588: \$? = $ac_status" >&5
++  echo "$as_me:12619: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12600,7 +12631,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12603: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12634: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12730,16 +12761,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:12733: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:12764: 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}:12739: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:12770: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 12742 "configure"
++#line 12773 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12754,16 +12785,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12757: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12788: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12760: \$? = $ac_status" >&5
++  echo "$as_me:12791: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12763: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12766: \$? = $ac_status" >&5
++  echo "$as_me:12797: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -12784,7 +12815,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 12787 "configure"
++#line 12818 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12799,16 +12830,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12802: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12833: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12805: \$? = $ac_status" >&5
++  echo "$as_me:12836: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12839: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12811: \$? = $ac_status" >&5
++  echo "$as_me:12842: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12819,7 +12850,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:12822: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12853: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -12827,10 +12858,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:12830: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:12861: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 12833 "configure"
++#line 12864 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12845,16 +12876,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12879: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12851: \$? = $ac_status" >&5
++  echo "$as_me:12882: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12857: \$? = $ac_status" >&5
++  echo "$as_me:12888: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12870,7 +12901,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12873: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:12904: 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
+@@ -13064,7 +13095,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:13067: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:13098: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -13074,7 +13105,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:13077: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:13108: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -13084,7 +13115,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:13087: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:13118: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -13094,10 +13125,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:13097: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:13128: checking if _XOPEN_SOURCE really is set" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 13100 "configure"
++#line 13131 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13112,16 +13143,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13115: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13146: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13118: \$? = $ac_status" >&5
++  echo "$as_me:13149: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13124: \$? = $ac_status" >&5
++  echo "$as_me:13155: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -13130,12 +13161,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:13133: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:13164: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
+ 	if test $cf_XOPEN_SOURCE_set = yes
+ 	then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 13138 "configure"
++#line 13169 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13150,16 +13181,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13153: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13184: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13156: \$? = $ac_status" >&5
++  echo "$as_me:13187: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13190: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13162: \$? = $ac_status" >&5
++  echo "$as_me:13193: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -13170,19 +13201,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		if test $cf_XOPEN_SOURCE_set_ok = no
+ 		then
+-			{ echo "$as_me:13173: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:13204: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:13178: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13209: 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 13185 "configure"
++#line 13216 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13201,16 +13232,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13204: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13235: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13207: \$? = $ac_status" >&5
++  echo "$as_me:13238: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13210: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13241: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13213: \$? = $ac_status" >&5
++  echo "$as_me:13244: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13222,7 +13253,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 13225 "configure"
++#line 13256 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13241,16 +13272,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13244: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13275: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13247: \$? = $ac_status" >&5
++  echo "$as_me:13278: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13250: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13253: \$? = $ac_status" >&5
++  echo "$as_me:13284: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13265,7 +13296,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13268: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13299: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -13391,7 +13422,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:13394: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:13425: 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
+@@ -13403,7 +13434,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 13406 "configure"
++#line 13437 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13423,16 +13454,16 @@
+ }
+ _ACEOF
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13426: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13457: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13429: \$? = $ac_status" >&5
++  echo "$as_me:13460: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13463: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13435: \$? = $ac_status" >&5
++  echo "$as_me:13466: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -13442,16 +13473,16 @@
+ rm -f conftest.$ac_objext
+      	 CC="$CC -n32"
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13445: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13476: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13448: \$? = $ac_status" >&5
++  echo "$as_me:13479: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13454: \$? = $ac_status" >&5
++  echo "$as_me:13485: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -13465,13 +13496,13 @@
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-echo "$as_me:13468: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:13499: 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:13474: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:13505: 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
+@@ -13479,7 +13510,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13482 "configure"
++#line 13513 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13499,16 +13530,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13502: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13533: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13505: \$? = $ac_status" >&5
++  echo "$as_me:13536: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13508: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13539: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13511: \$? = $ac_status" >&5
++  echo "$as_me:13542: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -13517,7 +13548,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13520 "configure"
++#line 13551 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -13538,16 +13569,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13541: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13572: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13544: \$? = $ac_status" >&5
++  echo "$as_me:13575: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13547: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13550: \$? = $ac_status" >&5
++  echo "$as_me:13581: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -13558,7 +13589,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13561: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:13592: 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
+ 
+@@ -13568,7 +13599,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:13571: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:13602: 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
+@@ -13576,7 +13607,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13579 "configure"
++#line 13610 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13596,16 +13627,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13599: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13630: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13602: \$? = $ac_status" >&5
++  echo "$as_me:13633: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13636: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13608: \$? = $ac_status" >&5
++  echo "$as_me:13639: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -13614,7 +13645,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13617 "configure"
++#line 13648 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -13635,16 +13666,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13638: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13669: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13641: \$? = $ac_status" >&5
++  echo "$as_me:13672: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13644: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13675: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13647: \$? = $ac_status" >&5
++  echo "$as_me:13678: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -13655,7 +13686,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13658: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:13689: 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
+ 
+@@ -13668,7 +13699,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:13671: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:13702: 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
+@@ -13676,7 +13707,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13679 "configure"
++#line 13710 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13688,16 +13719,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13691: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13722: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13694: \$? = $ac_status" >&5
++  echo "$as_me:13725: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13700: \$? = $ac_status" >&5
++  echo "$as_me:13731: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -13706,7 +13737,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13709 "configure"
++#line 13740 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -13719,16 +13750,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13722: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13753: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13725: \$? = $ac_status" >&5
++  echo "$as_me:13756: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13728: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13759: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13731: \$? = $ac_status" >&5
++  echo "$as_me:13762: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -13739,7 +13770,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13742: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:13773: 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
+ 
+@@ -13753,13 +13784,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:13756: checking for fseeko" >&5
++echo "$as_me:13787: 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 13762 "configure"
++#line 13793 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13771,16 +13802,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13774: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13805: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13777: \$? = $ac_status" >&5
++  echo "$as_me:13808: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13783: \$? = $ac_status" >&5
++  echo "$as_me:13814: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -13790,7 +13821,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13793: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:13824: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -13829,14 +13860,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:13832: checking whether to use struct dirent64" >&5
++	echo "$as_me:13863: 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 13839 "configure"
++#line 13870 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -13852,22 +13883,23 @@
+ 		struct dirent64 *x = readdir((DIR *)0);
+ 		struct dirent *y = readdir((DIR *)0);
+ 		int z = x - y;
++		(void)z;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13893: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13864: \$? = $ac_status" >&5
++  echo "$as_me:13896: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13870: \$? = $ac_status" >&5
++  echo "$as_me:13902: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -13878,7 +13910,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13881: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13913: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13888,7 +13920,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:13891: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:13923: 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.
+@@ -13898,7 +13930,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:13901: result: $with_rcs_ids" >&5
++echo "$as_me:13933: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13908,7 +13940,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:13911: checking if you want to build with function extensions" >&5
++echo "$as_me:13943: 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.
+@@ -13918,7 +13950,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:13921: result: $with_ext_funcs" >&5
++echo "$as_me:13953: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -13936,7 +13968,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:13939: checking for extended use of const keyword" >&5
++echo "$as_me:13971: 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.
+@@ -13946,7 +13978,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:13949: result: $with_ext_const" >&5
++echo "$as_me:13981: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -13956,7 +13988,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:13959: checking if you want all development code" >&5
++echo "$as_me:13991: 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.
+@@ -13966,7 +13998,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:13969: result: $with_develop" >&5
++echo "$as_me:14001: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -13975,7 +14007,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:13978: checking if you want to link with the pthread library" >&5
++echo "$as_me:14010: 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.
+@@ -13985,27 +14017,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:13988: result: $with_pthread" >&5
++echo "$as_me:14020: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:13992: checking for pthread.h" >&5
++	echo "$as_me:14024: 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 13998 "configure"
++#line 14030 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:14002: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14034: \"$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:14008: \$? = $ac_status" >&5
++  echo "$as_me:14040: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14024,7 +14056,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14027: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:14059: 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
+ 
+@@ -14034,7 +14066,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:14037: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:14069: checking if we can link with the $cf_lib_pthread library" >&5
+ echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
+ 	    cf_save_LIBS="$LIBS"
+ 
+@@ -14055,7 +14087,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+-#line 14058 "configure"
++#line 14090 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14072,16 +14104,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14107: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14078: \$? = $ac_status" >&5
++  echo "$as_me:14110: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14084: \$? = $ac_status" >&5
++  echo "$as_me:14116: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_pthread=yes
+ else
+@@ -14091,7 +14123,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:14094: result: $with_pthread" >&5
++	    echo "$as_me:14126: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -14119,7 +14151,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:14122: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:14154: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14128,7 +14160,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14131: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:14163: 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.
+@@ -14138,18 +14170,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:14141: result: $use_weak_symbols" >&5
++echo "$as_me:14173: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:14145: checking if $CC supports weak symbols" >&5
++echo "$as_me:14177: 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 14152 "configure"
++#line 14184 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14175,16 +14207,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14210: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14181: \$? = $ac_status" >&5
++  echo "$as_me:14213: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14216: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14187: \$? = $ac_status" >&5
++  echo "$as_me:14219: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -14195,7 +14227,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:14198: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:14230: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -14224,13 +14256,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:14227: checking for _nc_TABSIZE" >&5
++echo "$as_me:14259: checking for _nc_TABSIZE" >&5
+ echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14233 "configure"
++#line 14265 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14261,16 +14293,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14296: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14267: \$? = $ac_status" >&5
++  echo "$as_me:14299: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14302: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14273: \$? = $ac_status" >&5
++  echo "$as_me:14305: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -14280,7 +14312,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14283: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:14315: result: $ac_cv_func__nc_TABSIZE" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
+ if test $ac_cv_func__nc_TABSIZE = yes; then
+   assume_reentrant=yes
+@@ -14292,7 +14324,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:14295: checking if you want experimental reentrant code" >&5
++echo "$as_me:14327: 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.
+@@ -14302,7 +14334,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:14305: result: $with_reentrant" >&5
++echo "$as_me:14337: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -14325,7 +14357,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:14328: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:14360: checking for prefix used to wrap public variables" >&5
+ echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
+ 
+ # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
+@@ -14335,7 +14367,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:14338: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:14370: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -14349,7 +14381,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:14352: checking if you want to see long compiling messages" >&5
++echo "$as_me:14384: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -14383,11 +14415,11 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:14386: result: $enableval" >&5
++echo "$as_me:14418: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:14390: checking if you want to see compiler warnings" >&5
++echo "$as_me:14422: 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.
+@@ -14395,7 +14427,7 @@
+   enableval="$enable_warnings"
+   with_warnings=$enableval
+ fi;
+-echo "$as_me:14398: result: $with_warnings" >&5
++echo "$as_me:14430: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ 
+ if test "x$with_warnings" = "xyes"; then
+@@ -14421,7 +14453,7 @@
+ done
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14424 "configure"
++#line 14456 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14430,32 +14462,32 @@
+ int
+ main (void)
+ {
+-String foo = malloc(1)
++String foo = malloc(1); (void)foo
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14439: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14471: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14442: \$? = $ac_status" >&5
++  echo "$as_me:14474: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14477: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14448: \$? = $ac_status" >&5
++  echo "$as_me:14480: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-echo "$as_me:14451: checking for X11/Xt const-feature" >&5
++echo "$as_me:14483: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14458 "configure"
++#line 14490 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -14472,16 +14504,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14475: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14507: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14478: \$? = $ac_status" >&5
++  echo "$as_me:14510: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14513: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14484: \$? = $ac_status" >&5
++  echo "$as_me:14516: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -14496,7 +14528,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:14499: result: $cf_cv_const_x_string" >&5
++echo "$as_me:14531: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -14525,7 +14557,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+  fi
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:14576: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -14557,12 +14589,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:14560: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:14592: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14563: \$? = $ac_status" >&5
++  echo "$as_me:14595: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:14565: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:14597: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -14570,7 +14602,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:14573: checking for $CC warning options..." >&5
++	{ echo "$as_me:14605: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -14594,12 +14626,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:14597: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:14629: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14600: \$? = $ac_status" >&5
++  echo "$as_me:14632: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:14602: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:14634: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Winline)
+@@ -14607,7 +14639,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:14610: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:14642: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -14617,7 +14649,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:14620: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:14652: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -14650,10 +14682,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:14653: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:14685: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:14737: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14708: \$? = $ac_status" >&5
++  echo "$as_me:14740: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:14710: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:14742: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -14767,7 +14799,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:14770: checking if you want to enable runtime assertions" >&5
++echo "$as_me:14802: 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.
+@@ -14777,7 +14809,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:14780: result: $with_assertions" >&5
++echo "$as_me:14812: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -14830,7 +14862,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14833: checking whether to add trace feature to all models" >&5
++echo "$as_me:14865: 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.
+@@ -14840,7 +14872,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:14843: result: $cf_with_trace" >&5
++echo "$as_me:14875: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -14948,7 +14980,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:14951: checking if we want to use GNAT projects" >&5
++echo "$as_me:14983: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -14965,7 +14997,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:14968: result: $enable_gnat_projects" >&5
++echo "$as_me:15000: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -14973,13 +15005,13 @@
+ (*mingw32*)
+ 	;;
+ (*)
+-echo "$as_me:14976: checking for gettimeofday" >&5
++echo "$as_me:15008: 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 14982 "configure"
++#line 15014 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15010,16 +15042,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15013: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15045: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15016: \$? = $ac_status" >&5
++  echo "$as_me:15048: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15022: \$? = $ac_status" >&5
++  echo "$as_me:15054: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -15029,7 +15061,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15032: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:15064: 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
+@@ -15038,7 +15070,7 @@
+ 
+ else
+ 
+-echo "$as_me:15041: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:15073: 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
+@@ -15046,7 +15078,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15049 "configure"
++#line 15081 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15065,16 +15097,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15068: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15100: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15071: \$? = $ac_status" >&5
++  echo "$as_me:15103: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15077: \$? = $ac_status" >&5
++  echo "$as_me:15109: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -15085,7 +15117,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15088: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:15120: 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
+ 
+@@ -15101,13 +15133,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:15104: checking for ANSI C header files" >&5
++echo "$as_me:15136: 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 15110 "configure"
++#line 15142 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -15115,13 +15147,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:15118: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15150: \"$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:15124: \$? = $ac_status" >&5
++  echo "$as_me:15156: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15143,7 +15175,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 15146 "configure"
++#line 15178 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15161,7 +15193,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 15164 "configure"
++#line 15196 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15182,7 +15214,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15185 "configure"
++#line 15217 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -15208,15 +15240,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15211: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15243: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15214: \$? = $ac_status" >&5
++  echo "$as_me:15246: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15216: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15248: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15219: \$? = $ac_status" >&5
++  echo "$as_me:15251: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -15229,7 +15261,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:15232: result: $ac_cv_header_stdc" >&5
++echo "$as_me:15264: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -15245,28 +15277,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15248: checking for $ac_header" >&5
++echo "$as_me:15280: 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 15254 "configure"
++#line 15286 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15260: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15292: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15263: \$? = $ac_status" >&5
++  echo "$as_me:15295: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15266: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15269: \$? = $ac_status" >&5
++  echo "$as_me:15301: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -15276,7 +15308,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15279: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15311: 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 <&5
++echo "$as_me:15321: 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 15295 "configure"
++#line 15327 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15307,16 +15339,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15310: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15342: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15313: \$? = $ac_status" >&5
++  echo "$as_me:15345: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15348: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15319: \$? = $ac_status" >&5
++  echo "$as_me:15351: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -15326,10 +15358,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15329: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15361: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:15332: checking size of signed char" >&5
++echo "$as_me:15364: 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
+@@ -15338,7 +15370,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15341 "configure"
++#line 15373 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15350,21 +15382,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15353: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15385: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15356: \$? = $ac_status" >&5
++  echo "$as_me:15388: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15391: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15362: \$? = $ac_status" >&5
++  echo "$as_me:15394: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 15367 "configure"
++#line 15399 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15376,16 +15408,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15411: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15382: \$? = $ac_status" >&5
++  echo "$as_me:15414: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15388: \$? = $ac_status" >&5
++  echo "$as_me:15420: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15401,7 +15433,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 15404 "configure"
++#line 15436 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15413,16 +15445,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15416: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15419: \$? = $ac_status" >&5
++  echo "$as_me:15451: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15422: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15454: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15425: \$? = $ac_status" >&5
++  echo "$as_me:15457: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15438,7 +15470,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 15441 "configure"
++#line 15473 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15450,16 +15482,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15453: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15485: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15456: \$? = $ac_status" >&5
++  echo "$as_me:15488: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15459: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15462: \$? = $ac_status" >&5
++  echo "$as_me:15494: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15472,12 +15504,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15475: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15507: 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 15480 "configure"
++#line 15512 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15493,15 +15525,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15496: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15499: \$? = $ac_status" >&5
++  echo "$as_me:15531: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15504: \$? = $ac_status" >&5
++  echo "$as_me:15536: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15517,19 +15549,19 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15520: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15552: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15558: 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 15532 "configure"
++#line 15564 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -15537,13 +15569,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:15540: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15572: \"$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:15546: \$? = $ac_status" >&5
++  echo "$as_me:15578: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15565,7 +15597,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 15568 "configure"
++#line 15600 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15583,7 +15615,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 15586 "configure"
++#line 15618 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15604,7 +15636,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15607 "configure"
++#line 15639 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -15630,15 +15662,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15665: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15636: \$? = $ac_status" >&5
++  echo "$as_me:15668: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15641: \$? = $ac_status" >&5
++  echo "$as_me:15673: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -15651,7 +15683,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:15654: result: $ac_cv_header_stdc" >&5
++echo "$as_me:15686: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -15664,13 +15696,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:15667: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:15699: 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 15673 "configure"
++#line 15705 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -15685,16 +15717,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15688: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15720: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15691: \$? = $ac_status" >&5
++  echo "$as_me:15723: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15694: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15726: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15697: \$? = $ac_status" >&5
++  echo "$as_me:15729: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -15704,7 +15736,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15707: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15739: 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 <&5
++  echo "$as_me:15752: 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
+@@ -15725,7 +15757,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15728 "configure"
++#line 15760 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15744,16 +15776,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15747: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15779: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15750: \$? = $ac_status" >&5
++  echo "$as_me:15782: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15785: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15756: \$? = $ac_status" >&5
++  echo "$as_me:15788: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -15764,14 +15796,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15767: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:15799: 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:15774: checking for opendir in -lx" >&5
++  echo "$as_me:15806: 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
+@@ -15779,7 +15811,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15782 "configure"
++#line 15814 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15798,16 +15830,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15833: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15804: \$? = $ac_status" >&5
++  echo "$as_me:15836: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15839: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15810: \$? = $ac_status" >&5
++  echo "$as_me:15842: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -15818,7 +15850,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15821: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:15853: 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"
+@@ -15826,13 +15858,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15829: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:15861: 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 15835 "configure"
++#line 15867 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -15848,16 +15880,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15883: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15854: \$? = $ac_status" >&5
++  echo "$as_me:15886: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15860: \$? = $ac_status" >&5
++  echo "$as_me:15892: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -15867,7 +15899,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15870: result: $ac_cv_header_time" >&5
++echo "$as_me:15902: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -15885,13 +15917,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:15888: checking for an ANSI C-conforming const" >&5
++echo "$as_me:15920: 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 15894 "configure"
++#line 15926 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15949,16 +15981,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15952: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15984: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15955: \$? = $ac_status" >&5
++  echo "$as_me:15987: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15958: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15961: \$? = $ac_status" >&5
++  echo "$as_me:15993: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -15968,7 +16000,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15971: result: $ac_cv_c_const" >&5
++echo "$as_me:16003: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -15980,7 +16012,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:15983: checking if data-only library module links" >&5
++echo "$as_me:16015: 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
+@@ -15988,20 +16020,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:16026: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15997: \$? = $ac_status" >&5
++  echo "$as_me:16029: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:16049: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16020: \$? = $ac_status" >&5
++  echo "$as_me:16052: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -16030,7 +16062,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16033 "configure"
++#line 16065 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -16041,15 +16073,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16076: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16047: \$? = $ac_status" >&5
++  echo "$as_me:16079: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16081: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16052: \$? = $ac_status" >&5
++  echo "$as_me:16084: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -16064,7 +16096,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16067: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:16099: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -16083,23 +16115,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16086: checking for $ac_header" >&5
++echo "$as_me:16118: 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 16092 "configure"
++#line 16124 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:16096: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16128: \"$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:16102: \$? = $ac_status" >&5
++  echo "$as_me:16134: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16118,7 +16150,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16121: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:16153: 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 <&5
++echo "$as_me:16163: 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
+@@ -16139,7 +16171,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16142 "configure"
++#line 16174 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16180,15 +16212,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16183: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16215: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16186: \$? = $ac_status" >&5
++  echo "$as_me:16218: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16188: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16220: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16191: \$? = $ac_status" >&5
++  echo "$as_me:16223: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -16203,16 +16235,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:16206: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:16238: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:16209: checking for mkstemp" >&5
++	echo "$as_me:16241: 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 16215 "configure"
++#line 16247 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16243,16 +16275,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16246: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16278: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16249: \$? = $ac_status" >&5
++  echo "$as_me:16281: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16252: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16255: \$? = $ac_status" >&5
++  echo "$as_me:16287: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -16262,7 +16294,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16265: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:16297: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -16291,7 +16323,7 @@
+ 	unset cf_TEMP_gnat
+ 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:16294: checking for $ac_word" >&5
++echo "$as_me:16326: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16308,7 +16340,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+-   echo "$as_me:16311: found $ac_dir/$ac_word" >&5
++   echo "$as_me:16343: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -16320,10 +16352,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:16323: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:16355: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:16326: result: no" >&5
++  echo "$as_me:16358: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16333,7 +16365,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:16336: checking for $cf_prog_gnat version" >&5
++echo "$as_me:16368: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16344,7 +16376,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:16347: result: $cf_cv_gnat_version" >&5
++echo "$as_me:16379: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -16373,7 +16405,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:16376: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:16408: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test $cf_gprconfig = C
+ 				then
+@@ -16392,10 +16424,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
+-					echo "$as_me:16395: result: $cf_gprconfig_value" >&5
++					echo "$as_me:16427: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:16398: result: missing" >&5
++					echo "$as_me:16430: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -16408,7 +16440,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:16411: checking for gnat version" >&5
++echo "$as_me:16443: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16419,7 +16451,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:16422: result: $cf_cv_gnat_version" >&5
++echo "$as_me:16454: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ 
+@@ -16428,7 +16460,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:16431: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:16463: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -16436,7 +16468,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:16439: checking for $ac_word" >&5
++echo "$as_me:16471: 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
+@@ -16451,7 +16483,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:16454: found $ac_dir/$ac_word" >&5
++echo "$as_me:16486: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16460,20 +16492,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:16463: result: $M4_exists" >&5
++  echo "$as_me:16495: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:16466: result: no" >&5
++  echo "$as_me:16498: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$ac_cv_prog_M4_exists" = no; then
+ 			cf_cv_prog_gnat_correct=no
+-			{ echo "$as_me:16472: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:16504: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ 		fi
+ 		if test "$cf_cv_prog_gnat_correct" = yes; then
+-			echo "$as_me:16476: checking if GNAT works" >&5
++			echo "$as_me:16508: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf conftest* *~conftest*
+@@ -16501,7 +16533,7 @@
+ fi
+ rm -rf conftest* *~conftest*
+ 
+-			echo "$as_me:16504: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:16536: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -16511,7 +16543,7 @@
+ 
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:16514: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:16546: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -16528,10 +16560,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:16531: result: $ADAFLAGS" >&5
++	echo "$as_me:16563: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:16534: checking if GNATPREP supports -T option" >&5
++echo "$as_me:16566: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16541,11 +16573,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:16544: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:16576: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:16548: checking if GNAT supports generics" >&5
++echo "$as_me:16580: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case $cf_cv_gnat_version in
+ (3.[1-9]*|[4-9].*)
+@@ -16555,7 +16587,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:16558: result: $cf_gnat_generics" >&5
++echo "$as_me:16590: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -16567,7 +16599,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:16570: checking if GNAT supports SIGINT" >&5
++echo "$as_me:16602: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16615,7 +16647,7 @@
+ rm -rf conftest* *~conftest*
+ 
+ fi
+-echo "$as_me:16618: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:16650: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -16628,7 +16660,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:16631: checking if GNAT supports project files" >&5
++echo "$as_me:16663: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case $cf_cv_gnat_version in
+ (3.[0-9]*)
+@@ -16691,15 +16723,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:16694: result: $cf_gnat_projects" >&5
++echo "$as_me:16726: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test $cf_gnat_projects = yes
+ then
+-	echo "$as_me:16700: checking if GNAT supports libraries" >&5
++	echo "$as_me:16732: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:16702: result: $cf_gnat_libraries" >&5
++	echo "$as_me:16734: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -16719,7 +16751,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:16722: checking for ada-compiler" >&5
++echo "$as_me:16754: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -16730,12 +16762,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:16733: result: $cf_ada_compiler" >&5
++echo "$as_me:16765: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:16738: checking for ada-include" >&5
++echo "$as_me:16770: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -16771,7 +16803,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:16774: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:16806: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -16780,10 +16812,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:16783: result: $ADA_INCLUDE" >&5
++echo "$as_me:16815: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:16786: checking for ada-objects" >&5
++echo "$as_me:16818: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -16819,7 +16851,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:16822: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:16854: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -16828,10 +16860,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:16831: result: $ADA_OBJECTS" >&5
++echo "$as_me:16863: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:16834: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:16866: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -16841,14 +16873,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:16844: result: $with_ada_sharedlib" >&5
++echo "$as_me:16876: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:16851: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:16883: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -16868,7 +16900,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:16871: checking for ada-libname" >&5
++echo "$as_me:16903: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -16884,16 +16916,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16887: result: $ADA_LIBNAME" >&5
++echo "$as_me:16919: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:16891: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:16923: error: No usable Ada compiler found" >&5
+ echo "$as_me: error: No usable Ada compiler found" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ else
+-	{ { echo "$as_me:16896: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:16928: error: The Ada compiler is needed for this package" >&5
+ echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -16933,7 +16965,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:16936: checking default library suffix" >&5
++echo "$as_me:16968: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -16944,10 +16976,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:16947: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:16979: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:16950: checking default library-dependency suffix" >&5
++echo "$as_me:16982: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -17005,10 +17037,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:17008: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:17040: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:17011: checking default object directory" >&5
++echo "$as_me:17043: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -17024,7 +17056,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:17027: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:17059: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -17266,7 +17298,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:17269: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:17301: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -17442,7 +17474,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:17445: error: ambiguous option: $1
++    { { echo "$as_me:17477: 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;}
+@@ -17461,7 +17493,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:17464: error: unrecognized option: $1
++  -*) { { echo "$as_me:17496: 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;}
+@@ -17533,7 +17565,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:17536: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:17568: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -17885,7 +17917,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:17888: creating $ac_file" >&5
++    { echo "$as_me:17920: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -17903,7 +17935,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:17906: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:17938: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -17916,7 +17948,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:17919: error: cannot find input file: $f" >&5
++           { { echo "$as_me:17951: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -17932,7 +17964,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:17935: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:17967: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -17941,7 +17973,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:17944: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:17976: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -17978,7 +18010,7 @@
+             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:17981: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:18013: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -17989,7 +18021,7 @@
+     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:17992: WARNING: Some variables may not be substituted:
++      { echo "$as_me:18024: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -18038,7 +18070,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:18041: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:18073: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -18049,7 +18081,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:18052: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:18084: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -18062,7 +18094,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:18065: error: cannot find input file: $f" >&5
++           { { echo "$as_me:18097: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -18120,7 +18152,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:18123: $ac_file is unchanged" >&5
++      { echo "$as_me:18155: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: MANIFEST
+--- ncurses-6.2-20200314+/MANIFEST	2020-02-01 22:37:08.000000000 +0000
++++ ncurses-6.2-20200321/MANIFEST	2020-03-22 00:33:12.000000000 +0000
+@@ -1123,6 +1123,7 @@
+ ./test/dots_xcurses.c
+ ./test/dump_window.c
+ ./test/dump_window.h
++./test/dup_field.c
+ ./test/echochar.c
+ ./test/edit_field.c
+ ./test/edit_field.h
+@@ -1155,6 +1156,7 @@
+ ./test/mini.xterm_48x48.xpm
+ ./test/mk-test.awk
+ ./test/modules
++./test/move_field.c
+ ./test/movewindow.c
+ ./test/ncurses.c
+ ./test/ncurses_tst.hin
+Index: NEWS
+Prereq:  1.3463 
+--- ncurses-6.2-20200314+/NEWS	2020-03-15 00:15:32.000000000 +0000
++++ ncurses-6.2-20200321/NEWS	2020-03-22 00:28:35.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3463 2020/03/15 00:15:32 tom Exp $
++-- $Id: NEWS,v 1.3466 2020/03/22 00:28:35 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,13 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20200321
++	+ improve configure-checks to reduce warnings about unused variables.
++	+ improve description of error-returns in waddch and waddnstr manual
++	  pages (prompted by patch by Benno Schulenberg).
++	+ add test/move_field.c to demonstrate move_field(), and a stub for
++	  a corresponding demo of dup_field().
++
+ 20200314
+ 	+ add history note to curs_scanw.3x for  and 
+ 	+ add history note to curs_printw.3x for  and 
+Index: VERSION
+--- ncurses-6.2-20200314+/VERSION	2020-03-14 15:30:00.000000000 +0000
++++ ncurses-6.2-20200321/VERSION	2020-03-21 12:15:18.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.2	20200314
++5:0:10	6.2	20200321
+Index: aclocal.m4
+Prereq:  1.903 
+--- ncurses-6.2-20200314+/aclocal.m4	2020-03-08 01:05:14.000000000 +0000
++++ ncurses-6.2-20200321/aclocal.m4	2020-03-20 00:46:13.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.903 2020/03/08 01:05:14 tom Exp $
++dnl $Id: aclocal.m4,v 1.904 2020/03/20 00:46:13 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -42,7 +42,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ dnl ---------------------------------------------------------------------------
+-dnl AM_LANGINFO_CODESET version: 4 updated: 2015/04/18 08:56:57
++dnl AM_LANGINFO_CODESET version: 5 updated: 2020/03/10 18:53:47
+ dnl -------------------
+ dnl Inserted as requested by gettext 0.10.40
+ dnl File from /usr/share/aclocal
+@@ -55,7 +55,7 @@
+ [
+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+ 	[AC_TRY_LINK([#include ],
+-	[char* cs = nl_langinfo(CODESET);],
++	[char* cs = nl_langinfo(CODESET); (void)cs],
+ 	am_cv_langinfo_codeset=yes,
+ 	am_cv_langinfo_codeset=no)
+ 	])
+@@ -957,7 +957,7 @@
+ CF_CHECK_EXTERN_DATA($1,ifelse([$2],,int,[$2]))
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CHECK_ERRNO version: 12 updated: 2015/04/18 08:56:57
++dnl CF_CHECK_ERRNO version: 13 updated: 2020/03/10 18:53:47
+ dnl --------------
+ dnl Check for data that is usually declared in  or , e.g.,
+ dnl the 'errno' variable.  Define a DECL_xxx symbol if we must declare it
+@@ -975,7 +975,7 @@
+ #include 
+ #include 
+ #include  ],
+-	ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1,
++	ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1; (void)x,
+ 	[cf_cv_dcl_$1=yes],
+ 	[cf_cv_dcl_$1=no])
+ ])
+@@ -1427,7 +1427,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CONST_X_STRING version: 3 updated: 2020/01/11 18:39:22
++dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47
+ dnl -----------------
+ dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
+ dnl character-strings.
+@@ -1457,7 +1457,7 @@
+ #include 
+ #include 
+ ],
+-[String foo = malloc(1)],[
++[String foo = malloc(1); (void)foo],[
+ 
+ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
+ 	AC_TRY_COMPILE(
+@@ -2476,7 +2476,7 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00
++dnl CF_GCC_ATTRIBUTES version: 18 updated: 2020/03/10 18:53:47
+ dnl -----------------
+ dnl Test for availability of useful gcc __attribute__ directives to quiet
+ dnl compiler warnings.  Though useful, not all are supported -- and contrary
+@@ -2520,7 +2520,7 @@
+ extern void wow(char *,...) GCC_SCANFLIKE(1,2);
+ extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
+ extern void foo(void) GCC_NORETURN;
+-int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { return 0; }
++int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { (void)argc; (void)argv; return 0; }
+ EOF
+ 	cf_printf_attribute=no
+ 	cf_scanf_attribute=no
+@@ -3675,7 +3675,7 @@
+ test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII,1,[Define to 1 if we have isascii()])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LARGEFILE version: 11 updated: 2018/06/20 20:23:13
++dnl CF_LARGEFILE version: 12 updated: 2020/03/19 20:23:48
+ dnl ------------
+ dnl Add checks for large file support.
+ AC_DEFUN([CF_LARGEFILE],[
+@@ -3715,6 +3715,7 @@
+ 		struct dirent64 *x = readdir((DIR *)0);
+ 		struct dirent *y = readdir((DIR *)0);
+ 		int z = x - y;
++		(void)z;
+ 		],
+ 		[cf_cv_struct_dirent64=yes],
+ 		[cf_cv_struct_dirent64=no])
+@@ -6288,7 +6289,7 @@
+ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_REGEX version: 12 updated: 2015/04/18 08:56:57
++dnl CF_REGEX version: 13 updated: 2020/03/10 18:53:47
+ dnl --------
+ dnl Attempt to determine if we've got one of the flavors of regular-expression
+ dnl code that we can support.
+@@ -6335,6 +6336,8 @@
+ 		AC_TRY_LINK([#include <$cf_regex_hdr>],[
+ 			char *p = compile("", "", "", 0);
+ 			int x = step("", "");
++			(void)p;
++			(void)x;
+ 		],[
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+ 			break
+@@ -6346,9 +6349,11 @@
+ 	do
+ 		AC_TRY_LINK([#include 
+ #include <$cf_regex_hdr>],[
+-			regex_t *p;
++			regex_t *p = 0;
+ 			int x = regcomp(p, "", 0);
+ 			int y = regexec(p, "", 0, 0, 0);
++			(void)x;
++			(void)y;
+ 			regfree(p);
+ 		],[
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -7043,7 +7048,7 @@
+ 	fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SIGWINCH version: 2 updated: 2019/03/23 19:54:44
++dnl CF_SIGWINCH version: 3 updated: 2020/03/10 18:53:47
+ dnl -----------
+ dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
+ dnl programs need this test).
+@@ -7058,7 +7063,7 @@
+ 	AC_TRY_COMPILE([
+ #include 
+ #include 
+-],[int x = SIGWINCH],
++],[int x = SIGWINCH; (void)x],
+ 	[cf_cv_define_sigwinch=yes],
+ 	[AC_TRY_COMPILE([
+ #undef _XOPEN_SOURCE
+@@ -7066,7 +7071,7 @@
+ #undef _POSIX_C_SOURCE
+ #include 
+ #include 
+-],[int x = SIGWINCH],
++],[int x = SIGWINCH; (void)x],
+ 	[cf_cv_define_sigwinch=maybe],
+ 	[cf_cv_define_sigwinch=no])
+ ])
+@@ -7088,7 +7093,7 @@
+ #if SIGWINCH != $cf_sigwinch
+ make an error
+ #endif
+-int x = SIGWINCH],
++int x = SIGWINCH; (void)x],
+ 	[cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break])
+ 
+@@ -7102,7 +7107,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SIG_ATOMIC_T version: 4 updated: 2020/01/18 12:30:44
++dnl CF_SIG_ATOMIC_T version: 5 updated: 2020/03/10 18:53:47
+ dnl ---------------
+ dnl signal handler, but there are some gcc dependencies in that recommendation.
+ dnl Try anyway.
+@@ -7124,6 +7129,7 @@
+ $cf_type x;
+ static void handler(int sig)
+ {
++	(void)sig;
+ 	x = 5;
+ }],
+ 		[signal(SIGINT, handler);
+@@ -7137,7 +7143,7 @@
+ test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t,[Define to signal global datatype])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SIZECHANGE version: 14 updated: 2018/06/20 20:23:13
++dnl CF_SIZECHANGE version: 16 updated: 2020/03/19 20:46:13
+ dnl -------------
+ dnl Check for definitions & structures needed for window size-changing
+ dnl
+@@ -7180,13 +7186,17 @@
+ ],[
+ #ifdef TIOCGSIZE
+ 	struct ttysize win;	/* SunOS 3.0... */
+-	int y = win.ts_lines;
+-	int x = win.ts_cols;
++	int y = win.ts_lines = 2;
++	int x = win.ts_cols = 1;
++	(void)y;
++	(void)x;
+ #else
+ #ifdef TIOCGWINSZ
+ 	struct winsize win;	/* everything else */
+-	int y = win.ws_row;
+-	int x = win.ws_col;
++	int y = win.ws_row = 2;
++	int x = win.ws_col = 1;
++	(void)y;
++	(void)x;
+ #else
+ 	no TIOCGSIZE or TIOCGWINSZ
+ #endif /* TIOCGWINSZ */
+@@ -7425,7 +7435,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_STRUCT_TERMIOS version: 9 updated: 2018/06/08 21:57:23
++dnl CF_STRUCT_TERMIOS version: 11 updated: 2020/03/19 20:46:13
+ dnl -----------------
+ dnl Some machines require _POSIX_SOURCE to completely define struct termios.
+ AC_DEFUN([CF_STRUCT_TERMIOS],[
+@@ -7448,12 +7458,12 @@
+ 	if test "$termios_bad" = maybe ; then
+ 	AC_MSG_CHECKING(whether termios.h needs _POSIX_SOURCE)
+ 	AC_TRY_COMPILE([#include ],
+-		[struct termios foo; int x = foo.c_iflag],
++		[struct termios foo; int x = foo.c_iflag = 1; (void)x],
+ 		termios_bad=no, [
+ 		AC_TRY_COMPILE([
+ #define _POSIX_SOURCE
+ #include ],
+-			[struct termios foo; int x = foo.c_iflag],
++			[struct termios foo; int x = foo.c_iflag = 2; (void)x],
+ 			termios_bad=unknown,
+ 			termios_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE]))
+ 			])
+Index: configure
+--- ncurses-6.2-20200314+/configure	2020-03-08 01:10:17.000000000 +0000
++++ ncurses-6.2-20200321/configure	2020-03-22 00:29:35.000000000 +0000
+@@ -11017,7 +11017,7 @@
+ int
+ main (void)
+ {
+-int x = SIGWINCH
++int x = SIGWINCH; (void)x
+   ;
+   return 0;
+ }
+@@ -11051,7 +11051,7 @@
+ int
+ main (void)
+ {
+-int x = SIGWINCH
++int x = SIGWINCH; (void)x
+   ;
+   return 0;
+ }
+@@ -11111,7 +11111,7 @@
+ #if SIGWINCH != $cf_sigwinch
+ make an error
+ #endif
+-int x = SIGWINCH
++int x = SIGWINCH; (void)x
+   ;
+   return 0;
+ }
+@@ -11162,7 +11162,7 @@
+ int
+ main (void)
+ {
+-char* cs = nl_langinfo(CODESET);
++char* cs = nl_langinfo(CODESET); (void)cs
+   ;
+   return 0;
+ }
+@@ -13005,22 +13005,23 @@
+ 		struct dirent64 *x = readdir((DIR *)0);
+ 		struct dirent *y = readdir((DIR *)0);
+ 		int z = x - y;
++		(void)z;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13015: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13017: \$? = $ac_status" >&5
++  echo "$as_me:13018: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13023: \$? = $ac_status" >&5
++  echo "$as_me:13024: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -13031,7 +13032,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13034: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13035: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13041,7 +13042,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:13044: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:13045: 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.
+@@ -13051,14 +13052,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:13054: result: $with_tparm_varargs" >&5
++echo "$as_me:13055: result: $with_tparm_varargs" >&5
+ echo "${ECHO_T}$with_tparm_varargs" >&6
+ NCURSES_TPARM_VARARGS=0
+ test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
+ 
+ ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
+ if test "$with_ticlib" != no ; then
+-echo "$as_me:13061: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:13062: 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.
+@@ -13068,14 +13069,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:13071: result: $with_tic_depends" >&5
++echo "$as_me:13072: result: $with_tic_depends" >&5
+ echo "${ECHO_T}$with_tic_depends" >&6
+ else
+ 	with_tic_depends=no
+ fi
+ 
+ ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
+-echo "$as_me:13078: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
++echo "$as_me:13079: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
+ echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
+ 
+ # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
+@@ -13087,15 +13088,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:13090: result: yes" >&5
++	echo "$as_me:13091: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:13094: result: no" >&5
++	echo "$as_me:13095: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13098: checking for X11 rgb file" >&5
++echo "$as_me:13099: checking for X11 rgb file" >&5
+ echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
+ 
+ # Check whether --with-x11-rgb or --without-x11-rgb was given.
+@@ -13159,7 +13160,7 @@
+ 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:13162: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:13163: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -13167,7 +13168,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13170: result: $RGB_PATH" >&5
++echo "$as_me:13171: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:13185: 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.
+@@ -13191,10 +13192,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:13194: result: $NCURSES_BOOL" >&5
++echo "$as_me:13195: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:13197: checking for alternate terminal capabilities file" >&5
++echo "$as_me:13198: 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.
+@@ -13205,11 +13206,11 @@
+   TERMINFO_CAPS=Caps
+ fi;
+ test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:13208: result: $TERMINFO_CAPS" >&5
++echo "$as_me:13209: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:13212: checking for type of chtype" >&5
++echo "$as_me:13213: 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.
+@@ -13219,11 +13220,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:13222: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:13223: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:13226: checking for type of ospeed" >&5
++echo "$as_me:13227: 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.
+@@ -13233,11 +13234,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:13236: result: $NCURSES_OSPEED" >&5
++echo "$as_me:13237: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:13240: checking for type of mmask_t" >&5
++echo "$as_me:13241: 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.
+@@ -13247,11 +13248,11 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:13250: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:13251: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:13254: checking for size CCHARW_MAX" >&5
++echo "$as_me:13255: checking for size CCHARW_MAX" >&5
+ echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
+ 
+ # Check whether --with-ccharw-max or --without-ccharw-max was given.
+@@ -13261,16 +13262,16 @@
+ else
+   NCURSES_CCHARW_MAX=5
+ fi;
+-echo "$as_me:13264: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:13265: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:13267: checking for ANSI C header files" >&5
++echo "$as_me:13268: 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 13273 "configure"
++#line 13274 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -13278,13 +13279,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:13281: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13282: \"$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:13287: \$? = $ac_status" >&5
++  echo "$as_me:13288: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13306,7 +13307,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 13309 "configure"
++#line 13310 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -13324,7 +13325,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 13327 "configure"
++#line 13328 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -13345,7 +13346,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13348 "configure"
++#line 13349 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -13371,15 +13372,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13374: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13375: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13377: \$? = $ac_status" >&5
++  echo "$as_me:13378: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13379: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13380: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13382: \$? = $ac_status" >&5
++  echo "$as_me:13383: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -13392,7 +13393,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:13395: result: $ac_cv_header_stdc" >&5
++echo "$as_me:13396: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -13408,28 +13409,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13411: checking for $ac_header" >&5
++echo "$as_me:13412: 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 13417 "configure"
++#line 13418 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13423: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13424: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13426: \$? = $ac_status" >&5
++  echo "$as_me:13427: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13429: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13432: \$? = $ac_status" >&5
++  echo "$as_me:13433: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -13439,7 +13440,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13442: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13443: 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 <&5
++echo "$as_me:13453: 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 13458 "configure"
++#line 13459 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13470,16 +13471,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13473: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13474: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13476: \$? = $ac_status" >&5
++  echo "$as_me:13477: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13479: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13480: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13482: \$? = $ac_status" >&5
++  echo "$as_me:13483: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -13489,10 +13490,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13492: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:13493: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:13495: checking size of signed char" >&5
++echo "$as_me:13496: 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
+@@ -13501,7 +13502,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13504 "configure"
++#line 13505 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13513,21 +13514,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13516: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13517: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13519: \$? = $ac_status" >&5
++  echo "$as_me:13520: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13522: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13525: \$? = $ac_status" >&5
++  echo "$as_me:13526: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13530 "configure"
++#line 13531 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13539,16 +13540,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13542: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13543: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13545: \$? = $ac_status" >&5
++  echo "$as_me:13546: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13548: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13549: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13551: \$? = $ac_status" >&5
++  echo "$as_me:13552: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -13564,7 +13565,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13567 "configure"
++#line 13568 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13576,16 +13577,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13579: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13580: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13582: \$? = $ac_status" >&5
++  echo "$as_me:13583: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13585: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13586: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13588: \$? = $ac_status" >&5
++  echo "$as_me:13589: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -13601,7 +13602,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 13604 "configure"
++#line 13605 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13613,16 +13614,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13617: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13619: \$? = $ac_status" >&5
++  echo "$as_me:13620: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13623: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13625: \$? = $ac_status" >&5
++  echo "$as_me:13626: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -13635,12 +13636,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:13638: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:13639: 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 13643 "configure"
++#line 13644 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13656,15 +13657,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13660: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13662: \$? = $ac_status" >&5
++  echo "$as_me:13663: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13664: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13667: \$? = $ac_status" >&5
++  echo "$as_me:13668: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -13680,7 +13681,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:13683: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:13684: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:13695: 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.
+@@ -13701,12 +13702,12 @@
+ else
+   with_signed_char=no
+ fi;
+-echo "$as_me:13704: result: $with_signed_char" >&5
++echo "$as_me:13705: result: $with_signed_char" >&5
+ echo "${ECHO_T}$with_signed_char" >&6
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+ 
+ ###   use option --with-tparm-arg to override tparm's argument type
+-echo "$as_me:13709: checking for type of tparm args" >&5
++echo "$as_me:13710: checking for type of tparm args" >&5
+ echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -13716,11 +13717,11 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:13719: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:13720: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:13723: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:13724: 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.
+@@ -13730,7 +13731,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:13733: result: $with_rcs_ids" >&5
++echo "$as_me:13734: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -13739,7 +13740,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:13742: checking format of man-pages" >&5
++echo "$as_me:13743: 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.
+@@ -13828,14 +13829,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:13831: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:13832: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:13834: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:13835: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:13838: checking for manpage renaming" >&5
++echo "$as_me:13839: 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.
+@@ -13863,7 +13864,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:13866: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:13867: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -13877,10 +13878,10 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:13880: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:13881: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:13883: checking if manpage aliases will be installed" >&5
++echo "$as_me:13884: 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.
+@@ -13891,7 +13892,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:13894: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:13895: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -13905,7 +13906,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:13908: checking if manpage symlinks should be used" >&5
++echo "$as_me:13909: 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.
+@@ -13918,17 +13919,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:13921: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:13922: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:13927: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:13928: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:13931: checking for manpage tbl" >&5
++echo "$as_me:13932: 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.
+@@ -13939,7 +13940,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:13942: result: $MANPAGE_TBL" >&5
++echo "$as_me:13943: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -14272,7 +14273,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:14275: checking if you want to build with function extensions" >&5
++echo "$as_me:14276: 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.
+@@ -14282,7 +14283,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:14285: result: $with_ext_funcs" >&5
++echo "$as_me:14286: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -14342,7 +14343,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:14345: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:14346: checking if you want to build with SCREEN extensions" >&5
+ echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
+@@ -14352,7 +14353,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:14355: result: $with_sp_funcs" >&5
++echo "$as_me:14356: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -14371,7 +14372,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:14374: checking if you want to build with terminal-driver" >&5
++echo "$as_me:14375: checking if you want to build with terminal-driver" >&5
+ echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
+ 
+ # Check whether --enable-term-driver or --disable-term-driver was given.
+@@ -14381,7 +14382,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:14384: result: $with_term_driver" >&5
++echo "$as_me:14385: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -14390,19 +14391,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:14393: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:14394: error: The term-driver option conflicts with the termlib option" >&5
+ echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 	if test "x$with_sp_funcs" != xyes ; then
+-		{ { echo "$as_me:14398: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:14399: error: The term-driver option relies upon sp-funcs" >&5
+ echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:14405: checking for extended use of const keyword" >&5
++echo "$as_me:14406: 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.
+@@ -14412,7 +14413,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:14415: result: $with_ext_const" >&5
++echo "$as_me:14416: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -14420,7 +14421,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:14423: checking if you want to use extended colors" >&5
++echo "$as_me:14424: 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.
+@@ -14430,12 +14431,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:14433: result: $with_ext_colors" >&5
++echo "$as_me:14434: result: $with_ext_colors" >&5
+ echo "${ECHO_T}$with_ext_colors" >&6
+ NCURSES_EXT_COLORS=0
+ if test "x$with_ext_colors" = xyes ; then
+ 	if test "x$with_widec" != xyes ; then
+-		{ echo "$as_me:14438: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:14439: WARNING: This option applies only to wide-character library" >&5
+ echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
+ 	else
+ 		# cannot be ABI 5 since it changes sizeof(cchar_t)
+@@ -14445,7 +14446,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:14448: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:14449: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -14473,7 +14474,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:14476: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:14477: 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.
+@@ -14483,7 +14484,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:14486: result: $with_ext_mouse" >&5
++echo "$as_me:14487: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+@@ -14494,7 +14495,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:14497: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:14498: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -14503,7 +14504,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:14506: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:14507: checking if you want to use extended putwin/screendump" >&5
+ echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
+@@ -14513,7 +14514,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:14516: result: $with_ext_putwin" >&5
++echo "$as_me:14517: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -14523,7 +14524,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14526: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:14527: 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.
+@@ -14533,7 +14534,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:14536: result: $with_no_padding" >&5
++echo "$as_me:14537: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14541,7 +14542,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:14544: checking if you want SIGWINCH handler" >&5
++echo "$as_me:14545: 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.
+@@ -14551,7 +14552,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:14554: result: $with_sigwinch" >&5
++echo "$as_me:14555: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14559,7 +14560,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:14562: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:14563: 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.
+@@ -14569,14 +14570,14 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:14572: result: $with_tcap_names" >&5
++echo "$as_me:14573: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+ 
+ ##############################################################################
+ 
+-echo "$as_me:14579: checking if you want to link with the pthread library" >&5
++echo "$as_me:14580: 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.
+@@ -14586,27 +14587,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:14589: result: $with_pthread" >&5
++echo "$as_me:14590: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:14593: checking for pthread.h" >&5
++	echo "$as_me:14594: 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 14599 "configure"
++#line 14600 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:14603: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14604: \"$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:14609: \$? = $ac_status" >&5
++  echo "$as_me:14610: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14625,7 +14626,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14628: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:14629: 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
+ 
+@@ -14635,7 +14636,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:14638: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:14639: checking if we can link with the $cf_lib_pthread library" >&5
+ echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
+ 	    cf_save_LIBS="$LIBS"
+ 
+@@ -14656,7 +14657,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+-#line 14659 "configure"
++#line 14660 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14673,16 +14674,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14676: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14677: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14679: \$? = $ac_status" >&5
++  echo "$as_me:14680: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14685: \$? = $ac_status" >&5
++  echo "$as_me:14686: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_pthread=yes
+ else
+@@ -14692,7 +14693,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:14695: result: $with_pthread" >&5
++	    echo "$as_me:14696: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -14720,7 +14721,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:14723: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:14724: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14730,13 +14731,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:14733: checking for pthread_kill" >&5
++	echo "$as_me:14734: checking for pthread_kill" >&5
+ echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
+ if test "${ac_cv_func_pthread_kill+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14739 "configure"
++#line 14740 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14767,16 +14768,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14770: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14771: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14773: \$? = $ac_status" >&5
++  echo "$as_me:14774: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14776: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14779: \$? = $ac_status" >&5
++  echo "$as_me:14780: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -14786,11 +14787,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14789: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:14790: result: $ac_cv_func_pthread_kill" >&5
+ echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
+ if test $ac_cv_func_pthread_kill = yes; then
+ 
+-		echo "$as_me:14793: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:14794: checking if you want to allow EINTR in wgetch with pthreads" >&5
+ echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
+@@ -14800,7 +14801,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:14803: result: $use_pthreads_eintr" >&5
++		echo "$as_me:14804: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -14811,7 +14812,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:14814: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:14815: 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.
+@@ -14821,18 +14822,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:14824: result: $use_weak_symbols" >&5
++	echo "$as_me:14825: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:14828: checking if $CC supports weak symbols" >&5
++echo "$as_me:14829: 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 14835 "configure"
++#line 14836 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14858,16 +14859,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14862: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14864: \$? = $ac_status" >&5
++  echo "$as_me:14865: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14868: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14870: \$? = $ac_status" >&5
++  echo "$as_me:14871: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -14878,7 +14879,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:14881: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:14882: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -14928,7 +14929,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:14931: checking if you want reentrant code" >&5
++echo "$as_me:14932: checking if you want reentrant code" >&5
+ echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
+ 
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -14938,7 +14939,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:14941: result: $with_reentrant" >&5
++echo "$as_me:14942: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15026,7 +15027,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15029: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15030: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15038,7 +15039,7 @@
+ 	NCURSES_SIZE_T=short
+ fi
+ 
+-echo "$as_me:15041: checking if you want opaque curses-library structures" >&5
++echo "$as_me:15042: checking if you want opaque curses-library structures" >&5
+ echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -15060,16 +15061,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
+ 
+ fi;
+-echo "$as_me:15063: result: $enable_opaque_curses" >&5
++echo "$as_me:15064: result: $enable_opaque_curses" >&5
+ echo "${ECHO_T}$enable_opaque_curses" >&6
+ 
+ test "$cf_cv_enable_reentrant" = 1 && \
+ test "$enable_opaque_curses" = no && \
+-{ { echo "$as_me:15068: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:15069: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:15072: checking if you want opaque form-library structures" >&5
++echo "$as_me:15073: checking if you want opaque form-library structures" >&5
+ echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -15079,10 +15080,10 @@
+ else
+   enable_opaque_form=no
+ fi;
+-echo "$as_me:15082: result: $enable_opaque_form" >&5
++echo "$as_me:15083: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:15085: checking if you want opaque menu-library structures" >&5
++echo "$as_me:15086: checking if you want opaque menu-library structures" >&5
+ echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -15092,10 +15093,10 @@
+ else
+   enable_opaque_menu=no
+ fi;
+-echo "$as_me:15095: result: $enable_opaque_menu" >&5
++echo "$as_me:15096: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:15098: checking if you want opaque panel-library structures" >&5
++echo "$as_me:15099: checking if you want opaque panel-library structures" >&5
+ echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -15105,7 +15106,7 @@
+ else
+   enable_opaque_panel=no
+ fi;
+-echo "$as_me:15108: result: $enable_opaque_panel" >&5
++echo "$as_me:15109: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -15115,7 +15116,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15118: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15119: checking for prefix used to wrap public variables" >&5
+ echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
+ 
+ # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
+@@ -15125,7 +15126,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15128: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15129: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15138,7 +15139,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15141: checking if you want all development code" >&5
++echo "$as_me:15142: 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.
+@@ -15148,11 +15149,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15151: result: $with_develop" >&5
++echo "$as_me:15152: 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:15155: checking if you want hard-tabs code" >&5
++echo "$as_me:15156: 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.
+@@ -15162,7 +15163,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:15165: result: $enable_hard_tabs" >&5
++echo "$as_me:15166: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15170,7 +15171,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:15173: checking if you want limited support for xmc" >&5
++echo "$as_me:15174: 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.
+@@ -15180,7 +15181,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:15183: result: $enable_xmc_glitch" >&5
++echo "$as_me:15184: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15190,7 +15191,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:15193: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15194: 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.
+@@ -15200,7 +15201,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:15203: result: $with_assumed_color" >&5
++echo "$as_me:15204: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15208,7 +15209,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:15211: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:15212: 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.
+@@ -15218,7 +15219,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:15221: result: $with_hashmap" >&5
++echo "$as_me:15222: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15226,7 +15227,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:15229: checking if you want colorfgbg code" >&5
++echo "$as_me:15230: 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.
+@@ -15236,7 +15237,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:15239: result: $with_colorfgbg" >&5
++echo "$as_me:15240: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15244,7 +15245,7 @@
+ EOF
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:15247: checking if you want interop bindings" >&5
++echo "$as_me:15248: checking if you want interop bindings" >&5
+ echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
+ 
+ # Check whether --enable-interop or --disable-interop was given.
+@@ -15254,13 +15255,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:15257: result: $with_exp_interop" >&5
++echo "$as_me:15258: result: $with_exp_interop" >&5
+ echo "${ECHO_T}$with_exp_interop" >&6
+ 
+ NCURSES_INTEROP_FUNCS=0
+ test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
+ 
+-echo "$as_me:15263: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:15264: 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.
+@@ -15270,13 +15271,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:15273: result: $with_safe_sprintf" >&5
++echo "$as_me:15274: result: $with_safe_sprintf" >&5
+ echo "${ECHO_T}$with_safe_sprintf" >&6
+ 
+ ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
+ # when hashmap is used scroll hints are useless
+ if test "$with_hashmap" = no ; then
+-echo "$as_me:15279: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:15280: 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.
+@@ -15286,7 +15287,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:15289: result: $with_scroll_hints" >&5
++echo "$as_me:15290: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15295,7 +15296,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15298: checking if you want wgetch-events code" >&5
++echo "$as_me:15299: checking if you want wgetch-events code" >&5
+ echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
+ 
+ # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
+@@ -15305,7 +15306,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:15308: result: $with_wgetch_events" >&5
++echo "$as_me:15309: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ test "x$with_wgetch_events" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15316,7 +15317,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15319: checking if you want to see long compiling messages" >&5
++echo "$as_me:15320: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -15350,7 +15351,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:15353: result: $enableval" >&5
++echo "$as_me:15354: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -15363,7 +15364,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:15366: checking if you want to install stripped executables" >&5
++echo "$as_me:15367: checking if you want to install stripped executables" >&5
+ echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
+ 
+ # Check whether --enable-stripping or --disable-stripping was given.
+@@ -15380,7 +15381,7 @@
+ 	with_stripping=yes
+ 
+ fi;
+-echo "$as_me:15383: result: $with_stripping" >&5
++echo "$as_me:15384: result: $with_stripping" >&5
+ echo "${ECHO_T}$with_stripping" >&6
+ 
+ if test "$with_stripping" = yes
+@@ -15391,7 +15392,7 @@
+ fi
+ 
+ : ${INSTALL:=install}
+-echo "$as_me:15394: checking if install accepts -p option" >&5
++echo "$as_me:15395: checking if install accepts -p option" >&5
+ echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
+ if test "${cf_cv_install_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15422,10 +15423,10 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:15425: result: $cf_cv_install_p" >&5
++echo "$as_me:15426: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:15428: checking if install needs to be told about ownership" >&5
++echo "$as_me:15429: checking if install needs to be told about ownership" >&5
+ echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
+ case `$ac_config_guess` in
+ (*minix)
+@@ -15436,7 +15437,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15439: result: $with_install_o" >&5
++echo "$as_me:15440: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -15460,7 +15461,7 @@
+ fi
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:15463: checking if you want to see compiler warnings" >&5
++echo "$as_me:15464: 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.
+@@ -15468,7 +15469,7 @@
+   enableval="$enable_warnings"
+   with_warnings=$enableval
+ fi;
+-echo "$as_me:15471: result: $with_warnings" >&5
++echo "$as_me:15472: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ 
+ if test "x$with_warnings" = "xyes"; then
+@@ -15494,7 +15495,7 @@
+ done
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15497 "configure"
++#line 15498 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15503,32 +15504,32 @@
+ int
+ main (void)
+ {
+-String foo = malloc(1)
++String foo = malloc(1); (void)foo
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15512: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15513: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15515: \$? = $ac_status" >&5
++  echo "$as_me:15516: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15519: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15521: \$? = $ac_status" >&5
++  echo "$as_me:15522: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-echo "$as_me:15524: checking for X11/Xt const-feature" >&5
++echo "$as_me:15525: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15531 "configure"
++#line 15532 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -15545,16 +15546,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15549: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15551: \$? = $ac_status" >&5
++  echo "$as_me:15552: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15555: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15557: \$? = $ac_status" >&5
++  echo "$as_me:15558: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -15569,7 +15570,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:15572: result: $cf_cv_const_x_string" >&5
++echo "$as_me:15573: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -15598,7 +15599,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+  fi
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:15618: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -15630,12 +15631,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15633: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15634: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15636: \$? = $ac_status" >&5
++  echo "$as_me:15637: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15638: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15639: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -15643,7 +15644,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:15646: checking for $CC warning options..." >&5
++	{ echo "$as_me:15647: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -15667,12 +15668,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15670: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15671: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15673: \$? = $ac_status" >&5
++  echo "$as_me:15674: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15675: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15676: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Winline)
+@@ -15680,7 +15681,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15683: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15684: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15690,7 +15691,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15693: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15694: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15710,12 +15711,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	(linux*|gnu*)
+-		echo "$as_me:15713: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:15714: 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 15718 "configure"
++#line 15719 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15732,16 +15733,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15735: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15736: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15738: \$? = $ac_status" >&5
++  echo "$as_me:15739: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15744: \$? = $ac_status" >&5
++  echo "$as_me:15745: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -15752,7 +15753,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:15755: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:15756: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -15761,12 +15762,12 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:15764: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:15765: checking if this is really Clang C++ compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
+ 	cf_save_CFLAGS="$CXXFLAGS"
+ 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15769 "configure"
++#line 15770 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15783,16 +15784,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15786: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15787: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15789: \$? = $ac_status" >&5
++  echo "$as_me:15790: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15793: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15795: \$? = $ac_status" >&5
++  echo "$as_me:15796: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CLANG_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -15803,7 +15804,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:15806: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:15807: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -15815,7 +15816,7 @@
+ ac_main_return=return
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:15837: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -15850,12 +15851,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15853: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15854: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15856: \$? = $ac_status" >&5
++  echo "$as_me:15857: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15858: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15859: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -15864,7 +15865,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:15867: checking for $CXX warning options..." >&5
++	{ echo "$as_me:15868: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -15894,16 +15895,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:15897: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15898: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15900: \$? = $ac_status" >&5
++  echo "$as_me:15901: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15902: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15903: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:15906: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15907: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -15939,10 +15940,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:15942: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:15943: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:15995: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15997: \$? = $ac_status" >&5
++  echo "$as_me:15998: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:15999: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:16000: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -16055,7 +16056,7 @@
+ rm -rf conftest*
+ fi
+ 
+-echo "$as_me:16058: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:16059: checking if you want to work around bogus compiler/loader warnings" >&5
+ echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-string-hacks or --disable-string-hacks was given.
+@@ -16065,7 +16066,7 @@
+ else
+   with_string_hacks=no
+ fi;
+-echo "$as_me:16068: result: $with_string_hacks" >&5
++echo "$as_me:16069: result: $with_string_hacks" >&5
+ echo "${ECHO_T}$with_string_hacks" >&6
+ 
+ if test "x$with_string_hacks" = "xyes"; then
+@@ -16074,15 +16075,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:16077: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:16078: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+ echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
+-	echo "$as_me:16079: checking for strlcat" >&5
++	echo "$as_me:16080: checking for strlcat" >&5
+ echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
+ if test "${ac_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16085 "configure"
++#line 16086 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16113,16 +16114,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16116: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16117: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16119: \$? = $ac_status" >&5
++  echo "$as_me:16120: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16122: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16123: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16125: \$? = $ac_status" >&5
++  echo "$as_me:16126: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -16132,7 +16133,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16135: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:16136: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test $ac_cv_func_strlcat = yes; then
+ 
+@@ -16142,7 +16143,7 @@
+ 
+ else
+ 
+-		echo "$as_me:16145: checking for strlcat in -lbsd" >&5
++		echo "$as_me:16146: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16150,7 +16151,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16153 "configure"
++#line 16154 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16169,16 +16170,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16173: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16175: \$? = $ac_status" >&5
++  echo "$as_me:16176: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16179: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16181: \$? = $ac_status" >&5
++  echo "$as_me:16182: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -16189,7 +16190,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16192: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:16193: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test $ac_cv_lib_bsd_strlcat = yes; then
+ 
+@@ -16212,23 +16213,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16215: checking for $ac_header" >&5
++echo "$as_me:16216: 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 16221 "configure"
++#line 16222 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:16225: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16226: \"$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:16231: \$? = $ac_status" >&5
++  echo "$as_me:16232: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16247,7 +16248,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16250: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:16251: 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 <&5
++echo "$as_me:16272: 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 16277 "configure"
++#line 16278 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16305,16 +16306,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16308: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16309: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16311: \$? = $ac_status" >&5
++  echo "$as_me:16312: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16317: \$? = $ac_status" >&5
++  echo "$as_me:16318: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -16324,7 +16325,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16327: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:16328: 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 <&5
++echo "$as_me:16341: 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.
+@@ -16347,7 +16348,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:16350: result: $with_assertions" >&5
++echo "$as_me:16351: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16363,7 +16364,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:16366: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:16367: 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.
+@@ -16380,7 +16381,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:16383: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:16384: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16494,23 +16495,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:16497: checking for dmalloc.h" >&5
++	echo "$as_me:16498: 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 16503 "configure"
++#line 16504 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16507: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16508: \"$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:16513: \$? = $ac_status" >&5
++  echo "$as_me:16514: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16529,11 +16530,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16532: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:16533: 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:16536: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:16537: 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
+@@ -16541,7 +16542,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16544 "configure"
++#line 16545 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16560,16 +16561,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16563: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16564: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16566: \$? = $ac_status" >&5
++  echo "$as_me:16567: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16570: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16572: \$? = $ac_status" >&5
++  echo "$as_me:16573: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -16580,7 +16581,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16583: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:16584: 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 <&5
++echo "$as_me:16599: 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.
+@@ -16612,7 +16613,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:16615: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:16616: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16726,23 +16727,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:16729: checking for dbmalloc.h" >&5
++	echo "$as_me:16730: 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 16735 "configure"
++#line 16736 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16739: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16740: \"$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:16745: \$? = $ac_status" >&5
++  echo "$as_me:16746: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16761,11 +16762,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16764: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:16765: 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:16768: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:16769: 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
+@@ -16773,7 +16774,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16776 "configure"
++#line 16777 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16792,16 +16793,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16796: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16798: \$? = $ac_status" >&5
++  echo "$as_me:16799: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16802: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16804: \$? = $ac_status" >&5
++  echo "$as_me:16805: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -16812,7 +16813,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16815: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:16816: 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 <&5
++echo "$as_me:16831: 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.
+@@ -16844,7 +16845,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:16847: result: ${with_valgrind:-no}" >&5
++echo "$as_me:16848: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -16957,7 +16958,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16960: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:16961: 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.
+@@ -16967,7 +16968,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:16970: result: $with_no_leaks" >&5
++echo "$as_me:16971: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -17019,7 +17020,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17022: checking whether to add trace feature to all models" >&5
++echo "$as_me:17023: 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.
+@@ -17029,7 +17030,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:17032: result: $cf_with_trace" >&5
++echo "$as_me:17033: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -17143,7 +17144,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:17146: checking if we want to use GNAT projects" >&5
++echo "$as_me:17147: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -17160,7 +17161,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:17163: result: $enable_gnat_projects" >&5
++echo "$as_me:17164: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -17170,13 +17171,13 @@
+ 	# Note: WINVER may be a problem with Windows 10
+ 	;;
+ (*)
+-echo "$as_me:17173: checking for gettimeofday" >&5
++echo "$as_me:17174: 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 17179 "configure"
++#line 17180 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17207,16 +17208,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17210: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17211: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17213: \$? = $ac_status" >&5
++  echo "$as_me:17214: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17216: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17219: \$? = $ac_status" >&5
++  echo "$as_me:17220: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -17226,7 +17227,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17229: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17230: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test $ac_cv_func_gettimeofday = yes; then
+ 
+@@ -17236,7 +17237,7 @@
+ 
+ else
+ 
+-echo "$as_me:17239: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17240: 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
+@@ -17244,7 +17245,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17247 "configure"
++#line 17248 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17263,16 +17264,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17266: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17267: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17269: \$? = $ac_status" >&5
++  echo "$as_me:17270: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17272: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17275: \$? = $ac_status" >&5
++  echo "$as_me:17276: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17283,7 +17284,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17286: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17287: 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
+ 
+@@ -17313,14 +17314,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17316: checking if -lm needed for math functions" >&5
++echo "$as_me:17317: 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 17323 "configure"
++#line 17324 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -17336,16 +17337,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17340: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17342: \$? = $ac_status" >&5
++  echo "$as_me:17343: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17346: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17348: \$? = $ac_status" >&5
++  echo "$as_me:17349: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -17355,7 +17356,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17358: result: $cf_cv_need_libm" >&5
++echo "$as_me:17359: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -17363,13 +17364,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:17366: checking for ANSI C header files" >&5
++echo "$as_me:17367: 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 17372 "configure"
++#line 17373 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17377,13 +17378,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:17380: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17381: \"$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:17386: \$? = $ac_status" >&5
++  echo "$as_me:17387: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17405,7 +17406,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 17408 "configure"
++#line 17409 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17423,7 +17424,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 17426 "configure"
++#line 17427 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17444,7 +17445,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17447 "configure"
++#line 17448 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -17470,15 +17471,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17473: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17474: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17476: \$? = $ac_status" >&5
++  echo "$as_me:17477: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17481: \$? = $ac_status" >&5
++  echo "$as_me:17482: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -17491,7 +17492,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:17494: result: $ac_cv_header_stdc" >&5
++echo "$as_me:17495: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -17504,13 +17505,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:17507: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:17508: 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 17513 "configure"
++#line 17514 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17525,16 +17526,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17528: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17529: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17531: \$? = $ac_status" >&5
++  echo "$as_me:17532: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17537: \$? = $ac_status" >&5
++  echo "$as_me:17538: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17544,7 +17545,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17547: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17548: 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 <&5
++  echo "$as_me:17561: 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
+@@ -17565,7 +17566,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17568 "configure"
++#line 17569 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17584,16 +17585,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17587: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17588: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17590: \$? = $ac_status" >&5
++  echo "$as_me:17591: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17593: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17596: \$? = $ac_status" >&5
++  echo "$as_me:17597: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17604,14 +17605,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17607: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17608: 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:17614: checking for opendir in -lx" >&5
++  echo "$as_me:17615: 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
+@@ -17619,7 +17620,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17622 "configure"
++#line 17623 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17638,16 +17639,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17641: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17642: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17644: \$? = $ac_status" >&5
++  echo "$as_me:17645: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17647: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17650: \$? = $ac_status" >&5
++  echo "$as_me:17651: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17658,7 +17659,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17661: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17662: 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"
+@@ -17666,13 +17667,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17669: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17670: 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 17675 "configure"
++#line 17676 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17688,16 +17689,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17691: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17692: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17694: \$? = $ac_status" >&5
++  echo "$as_me:17695: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17698: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17700: \$? = $ac_status" >&5
++  echo "$as_me:17701: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17707,7 +17708,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17710: result: $ac_cv_header_time" >&5
++echo "$as_me:17711: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17726,13 +17727,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17729: checking for regcomp" >&5
++echo "$as_me:17730: checking for regcomp" >&5
+ echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
+ if test "${ac_cv_func_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17735 "configure"
++#line 17736 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17763,16 +17764,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17766: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17767: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17769: \$? = $ac_status" >&5
++  echo "$as_me:17770: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17772: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17775: \$? = $ac_status" >&5
++  echo "$as_me:17776: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -17782,7 +17783,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17785: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:17786: result: $ac_cv_func_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_func_regcomp" >&6
+ if test $ac_cv_func_regcomp = yes; then
+   cf_regex_func=regcomp
+@@ -17791,7 +17792,7 @@
+ 	for cf_regex_lib in $cf_regex_libs
+ 	do
+ 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
+-echo "$as_me:17794: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:17795: checking for regcomp in -l$cf_regex_lib" >&5
+ echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17799,7 +17800,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17802 "configure"
++#line 17803 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17818,16 +17819,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17821: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17822: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17824: \$? = $ac_status" >&5
++  echo "$as_me:17825: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17830: \$? = $ac_status" >&5
++  echo "$as_me:17831: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17838,7 +17839,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17841: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:17842: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -17867,13 +17868,13 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:17870: checking for compile" >&5
++	echo "$as_me:17871: checking for compile" >&5
+ echo $ECHO_N "checking for compile... $ECHO_C" >&6
+ if test "${ac_cv_func_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17876 "configure"
++#line 17877 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17904,16 +17905,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17907: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17908: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17910: \$? = $ac_status" >&5
++  echo "$as_me:17911: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17914: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17916: \$? = $ac_status" >&5
++  echo "$as_me:17917: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -17923,13 +17924,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17926: result: $ac_cv_func_compile" >&5
++echo "$as_me:17927: result: $ac_cv_func_compile" >&5
+ echo "${ECHO_T}$ac_cv_func_compile" >&6
+ if test $ac_cv_func_compile = yes; then
+   cf_regex_func=compile
+ else
+ 
+-		echo "$as_me:17932: checking for compile in -lgen" >&5
++		echo "$as_me:17933: checking for compile in -lgen" >&5
+ echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
+ if test "${ac_cv_lib_gen_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17937,7 +17938,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17940 "configure"
++#line 17941 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17956,16 +17957,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17960: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17962: \$? = $ac_status" >&5
++  echo "$as_me:17963: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17966: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17968: \$? = $ac_status" >&5
++  echo "$as_me:17969: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -17976,7 +17977,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17979: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:17980: result: $ac_cv_lib_gen_compile" >&5
+ echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
+ if test $ac_cv_lib_gen_compile = yes; then
+ 
+@@ -18004,11 +18005,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:18007: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:18008: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:18011: checking for regular-expression headers" >&5
++echo "$as_me:18012: checking for regular-expression headers" >&5
+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
+ if test "${cf_cv_regex_hdrs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18020,7 +18021,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18023 "configure"
++#line 18024 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -18029,22 +18030,24 @@
+ 
+ 			char *p = compile("", "", "", 0);
+ 			int x = step("", "");
++			(void)p;
++			(void)x;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18038: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18041: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18041: \$? = $ac_status" >&5
++  echo "$as_me:18044: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18044: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18047: \$? = $ac_status" >&5
++  echo "$as_me:18050: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -18061,7 +18064,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18064 "configure"
++#line 18067 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -18069,9 +18072,11 @@
+ main (void)
+ {
+ 
+-			regex_t *p;
++			regex_t *p = 0;
+ 			int x = regcomp(p, "", 0);
+ 			int y = regexec(p, "", 0, 0, 0);
++			(void)x;
++			(void)y;
+ 			regfree(p);
+ 
+   ;
+@@ -18079,16 +18084,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18087: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18085: \$? = $ac_status" >&5
++  echo "$as_me:18090: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18091: \$? = $ac_status" >&5
++  echo "$as_me:18096: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -18104,11 +18109,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:18107: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:18112: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case $cf_cv_regex_hdrs in
+-	(no)		{ echo "$as_me:18111: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:18116: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -18147,23 +18152,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18150: checking for $ac_header" >&5
++echo "$as_me:18155: 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 18156 "configure"
++#line 18161 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18160: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18165: \"$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:18166: \$? = $ac_status" >&5
++  echo "$as_me:18171: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18182,7 +18187,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:18185: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18190: 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 <&5
++echo "$as_me:18203: 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 18204 "configure"
++#line 18209 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18208: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18213: \"$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:18214: \$? = $ac_status" >&5
++  echo "$as_me:18219: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18230,7 +18235,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:18233: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18238: 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 <&5
++echo "$as_me:18248: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18250,7 +18255,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18253 "configure"
++#line 18258 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18263,16 +18268,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18266: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18271: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18269: \$? = $ac_status" >&5
++  echo "$as_me:18274: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18272: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18275: \$? = $ac_status" >&5
++  echo "$as_me:18280: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -18284,7 +18289,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18287: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18292: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -18301,14 +18306,14 @@
+ 
+ fi
+ 
+-echo "$as_me:18304: checking if external environ is declared" >&5
++echo "$as_me:18309: checking if external environ is declared" >&5
+ echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 18311 "configure"
++#line 18316 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -18324,16 +18329,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18332: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18330: \$? = $ac_status" >&5
++  echo "$as_me:18335: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18333: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18338: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18336: \$? = $ac_status" >&5
++  echo "$as_me:18341: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -18344,7 +18349,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18347: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:18352: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -18359,14 +18364,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:18362: checking if external environ exists" >&5
++echo "$as_me:18367: checking if external environ exists" >&5
+ echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
+ if test "${cf_cv_have_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18369 "configure"
++#line 18374 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -18381,16 +18386,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18384: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18389: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18387: \$? = $ac_status" >&5
++  echo "$as_me:18392: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18390: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18393: \$? = $ac_status" >&5
++  echo "$as_me:18398: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -18401,7 +18406,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18404: result: $cf_cv_have_environ" >&5
++echo "$as_me:18409: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -18414,13 +18419,13 @@
+ 
+ fi
+ 
+-echo "$as_me:18417: checking for getenv" >&5
++echo "$as_me:18422: checking for getenv" >&5
+ echo $ECHO_N "checking for getenv... $ECHO_C" >&6
+ if test "${ac_cv_func_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18423 "configure"
++#line 18428 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18451,16 +18456,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18454: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18459: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18457: \$? = $ac_status" >&5
++  echo "$as_me:18462: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18460: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18463: \$? = $ac_status" >&5
++  echo "$as_me:18468: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -18470,19 +18475,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18473: result: $ac_cv_func_getenv" >&5
++echo "$as_me:18478: result: $ac_cv_func_getenv" >&5
+ echo "${ECHO_T}$ac_cv_func_getenv" >&6
+ 
+ for ac_func in putenv setenv strdup
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18479: checking for $ac_func" >&5
++echo "$as_me:18484: 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 18485 "configure"
++#line 18490 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18513,16 +18518,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18516: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18521: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18519: \$? = $ac_status" >&5
++  echo "$as_me:18524: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18522: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18525: \$? = $ac_status" >&5
++  echo "$as_me:18530: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18532,7 +18537,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18535: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18540: 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 <&5
++echo "$as_me:18550: checking if getenv returns consistent values" >&5
+ echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
+ if test "${cf_cv_consistent_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18552,7 +18557,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18555 "configure"
++#line 18560 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18661,15 +18666,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18664: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18669: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18667: \$? = $ac_status" >&5
++  echo "$as_me:18672: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:18669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18672: \$? = $ac_status" >&5
++  echo "$as_me:18677: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -18682,7 +18687,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:18685: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:18690: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -18697,7 +18702,7 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:18700: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:18705: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+ echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
+ fi
+ 
+@@ -18705,7 +18710,7 @@
+ # Note: even non-Posix ISC needs  to declare fd_set
+ if test "x$ISC" = xyes ; then
+ 
+-echo "$as_me:18708: checking for main in -lcposix" >&5
++echo "$as_me:18713: 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
+@@ -18713,7 +18718,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18716 "configure"
++#line 18721 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18725,16 +18730,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18728: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18733: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18731: \$? = $ac_status" >&5
++  echo "$as_me:18736: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18739: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18737: \$? = $ac_status" >&5
++  echo "$as_me:18742: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cposix_main=yes
+ else
+@@ -18745,7 +18750,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18748: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:18753: 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 <&5
++	echo "$as_me:18764: 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
+@@ -18764,7 +18769,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18767 "configure"
++#line 18772 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18783,16 +18788,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18786: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18791: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18789: \$? = $ac_status" >&5
++  echo "$as_me:18794: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18797: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18795: \$? = $ac_status" >&5
++  echo "$as_me:18800: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_inet_bzero=yes
+ else
+@@ -18803,7 +18808,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18806: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:18811: 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
+ 
+@@ -18826,14 +18831,14 @@
+ fi
+ fi
+ 
+-echo "$as_me:18829: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:18834: 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 18836 "configure"
++#line 18841 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18853,16 +18858,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18856: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18859: \$? = $ac_status" >&5
++  echo "$as_me:18864: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18865: \$? = $ac_status" >&5
++  echo "$as_me:18870: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -18874,7 +18879,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18877: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:18882: 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
+@@ -18889,13 +18894,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:18892: checking for an ANSI C-conforming const" >&5
++echo "$as_me:18897: 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 18898 "configure"
++#line 18903 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18953,16 +18958,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18956: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18961: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18959: \$? = $ac_status" >&5
++  echo "$as_me:18964: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18965: \$? = $ac_status" >&5
++  echo "$as_me:18970: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -18972,7 +18977,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:18975: result: $ac_cv_c_const" >&5
++echo "$as_me:18980: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -18982,7 +18987,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18985: checking for inline" >&5
++echo "$as_me:18990: 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
+@@ -18990,7 +18995,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18993 "configure"
++#line 18998 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -18999,16 +19004,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19002: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19007: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19005: \$? = $ac_status" >&5
++  echo "$as_me:19010: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19011: \$? = $ac_status" >&5
++  echo "$as_me:19016: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -19019,7 +19024,7 @@
+ done
+ 
+ fi
+-echo "$as_me:19022: result: $ac_cv_c_inline" >&5
++echo "$as_me:19027: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -19045,7 +19050,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:19048: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:19053: checking if $CC supports options to tune inlining" >&5
+ echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
+ if test "${cf_cv_gcc_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19054,7 +19059,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 19057 "configure"
++#line 19062 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -19066,16 +19071,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19069: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19074: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19072: \$? = $ac_status" >&5
++  echo "$as_me:19077: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19078: \$? = $ac_status" >&5
++  echo "$as_me:19083: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -19087,7 +19092,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:19090: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:19095: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -19193,7 +19198,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:19196: checking for signal global datatype" >&5
++echo "$as_me:19201: 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
+@@ -19205,7 +19210,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19208 "configure"
++#line 19213 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19216,6 +19221,7 @@
+ $cf_type x;
+ static void handler(int sig)
+ {
++	(void)sig;
+ 	x = 5;
+ }
+ int
+@@ -19228,16 +19234,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19231: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19237: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19234: \$? = $ac_status" >&5
++  echo "$as_me:19240: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19237: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19240: \$? = $ac_status" >&5
++  echo "$as_me:19246: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -19251,7 +19257,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19254: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:19260: 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 <&5
++echo "$as_me:19269: 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
+@@ -19270,7 +19276,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19273 "configure"
++#line 19279 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -19305,15 +19311,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19308: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19314: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19311: \$? = $ac_status" >&5
++  echo "$as_me:19317: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19313: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19319: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19316: \$? = $ac_status" >&5
++  echo "$as_me:19322: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -19328,7 +19334,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19331: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:19337: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:19349: 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 19350 "configure"
++#line 19356 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -19359,16 +19365,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19362: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19365: \$? = $ac_status" >&5
++  echo "$as_me:19371: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19371: \$? = $ac_status" >&5
++  echo "$as_me:19377: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -19380,7 +19386,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19383: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:19389: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -19396,14 +19402,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:19399: checking if external errno is declared" >&5
++echo "$as_me:19405: 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 19406 "configure"
++#line 19412 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -19415,22 +19421,22 @@
+ int
+ main (void)
+ {
+-int x = (int) errno
++int x = (int) errno; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19424: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19430: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19427: \$? = $ac_status" >&5
++  echo "$as_me:19433: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19436: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19433: \$? = $ac_status" >&5
++  echo "$as_me:19439: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -19441,7 +19447,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19444: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:19450: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -19456,14 +19462,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:19459: checking if external errno exists" >&5
++echo "$as_me:19465: 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 19466 "configure"
++#line 19472 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -19478,16 +19484,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19481: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19487: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19484: \$? = $ac_status" >&5
++  echo "$as_me:19490: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19487: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19493: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19490: \$? = $ac_status" >&5
++  echo "$as_me:19496: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -19498,7 +19504,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19501: result: $cf_cv_have_errno" >&5
++echo "$as_me:19507: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -19511,7 +19517,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19514: checking if data-only library module links" >&5
++echo "$as_me:19520: 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
+@@ -19519,20 +19525,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:19531: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19528: \$? = $ac_status" >&5
++  echo "$as_me:19534: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:19554: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19551: \$? = $ac_status" >&5
++  echo "$as_me:19557: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -19561,7 +19567,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19564 "configure"
++#line 19570 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -19572,15 +19578,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19575: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19581: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19578: \$? = $ac_status" >&5
++  echo "$as_me:19584: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19586: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19583: \$? = $ac_status" >&5
++  echo "$as_me:19589: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -19595,7 +19601,7 @@
+ 
+ fi
+ 
+-echo "$as_me:19598: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:19604: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -19637,13 +19643,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19640: checking for $ac_func" >&5
++echo "$as_me:19646: 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 19646 "configure"
++#line 19652 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19674,16 +19680,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19677: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19683: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19680: \$? = $ac_status" >&5
++  echo "$as_me:19686: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19686: \$? = $ac_status" >&5
++  echo "$as_me:19692: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19693,7 +19699,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:19696: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:19702: 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 <&5
++	{ { echo "$as_me:19714: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19714,7 +19720,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:19717: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:19723: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -19727,14 +19733,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:19730: checking for terminal-capability database functions" >&5
++echo "$as_me:19736: 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 19737 "configure"
++#line 19743 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19754,16 +19760,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19757: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19763: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19760: \$? = $ac_status" >&5
++  echo "$as_me:19766: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19763: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19769: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19766: \$? = $ac_status" >&5
++  echo "$as_me:19772: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -19774,7 +19780,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19777: result: $cf_cv_cgetent" >&5
++echo "$as_me:19783: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -19784,14 +19790,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:19787: checking if cgetent uses const parameter" >&5
++echo "$as_me:19793: checking if cgetent uses const parameter" >&5
+ echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
+ if test "${cf_cv_cgetent_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19794 "configure"
++#line 19800 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -19814,16 +19820,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19817: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19823: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19820: \$? = $ac_status" >&5
++  echo "$as_me:19826: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19829: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19826: \$? = $ac_status" >&5
++  echo "$as_me:19832: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -19834,7 +19840,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19837: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:19843: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -19848,14 +19854,14 @@
+ 
+ fi
+ 
+-echo "$as_me:19851: checking for isascii" >&5
++echo "$as_me:19857: 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 19858 "configure"
++#line 19864 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -19867,16 +19873,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19870: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19876: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19873: \$? = $ac_status" >&5
++  echo "$as_me:19879: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19876: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19882: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19879: \$? = $ac_status" >&5
++  echo "$as_me:19885: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -19887,7 +19893,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:19890: result: $cf_cv_have_isascii" >&5
++echo "$as_me:19896: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -19895,10 +19901,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:19898: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:19904: 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 19901 "configure"
++#line 19907 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19912,16 +19918,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19915: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19921: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19918: \$? = $ac_status" >&5
++  echo "$as_me:19924: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19921: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19927: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19924: \$? = $ac_status" >&5
++  echo "$as_me:19930: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=no
+ else
+@@ -19929,7 +19935,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19932 "configure"
++#line 19938 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -19944,16 +19950,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19947: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19953: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19950: \$? = $ac_status" >&5
++  echo "$as_me:19956: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19953: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19959: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19956: \$? = $ac_status" >&5
++  echo "$as_me:19962: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=yes
+ 
+@@ -19969,11 +19975,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19972: result: $sigact_bad" >&5
++echo "$as_me:19978: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:19976: checking if nanosleep really works" >&5
++echo "$as_me:19982: 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
+@@ -19983,7 +19989,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19986 "configure"
++#line 19992 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20008,15 +20014,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20017: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20014: \$? = $ac_status" >&5
++  echo "$as_me:20020: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20022: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20019: \$? = $ac_status" >&5
++  echo "$as_me:20025: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -20028,7 +20034,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:20031: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:20037: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -20045,23 +20051,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20048: checking for $ac_header" >&5
++echo "$as_me:20054: 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 20054 "configure"
++#line 20060 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20058: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20064: \"$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:20064: \$? = $ac_status" >&5
++  echo "$as_me:20070: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20080,7 +20086,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20083: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20089: 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 <&5
++	echo "$as_me:20106: 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 20103 "configure"
++#line 20109 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+ main (void)
+ {
+-struct termios foo; int x = foo.c_iflag
++struct termios foo; int x = foo.c_iflag = 1; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20115: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20121: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20118: \$? = $ac_status" >&5
++  echo "$as_me:20124: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20124: \$? = $ac_status" >&5
++  echo "$as_me:20130: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=no
+ else
+@@ -20129,7 +20135,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 20132 "configure"
++#line 20138 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -20137,22 +20143,22 @@
+ int
+ main (void)
+ {
+-struct termios foo; int x = foo.c_iflag
++struct termios foo; int x = foo.c_iflag = 2; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20146: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20152: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20149: \$? = $ac_status" >&5
++  echo "$as_me:20155: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20152: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20158: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20155: \$? = $ac_status" >&5
++  echo "$as_me:20161: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=unknown
+ else
+@@ -20168,19 +20174,19 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:20171: result: $termios_bad" >&5
++	echo "$as_me:20177: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:20176: checking for tcgetattr" >&5
++echo "$as_me:20182: 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 20183 "configure"
++#line 20189 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20208,16 +20214,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20211: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20217: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20214: \$? = $ac_status" >&5
++  echo "$as_me:20220: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20223: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20220: \$? = $ac_status" >&5
++  echo "$as_me:20226: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -20227,21 +20233,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20230: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:20236: 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:20237: checking for vsscanf function or workaround" >&5
++echo "$as_me:20243: 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 20244 "configure"
++#line 20250 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20257,16 +20263,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20260: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20266: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20263: \$? = $ac_status" >&5
++  echo "$as_me:20269: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20266: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20272: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20269: \$? = $ac_status" >&5
++  echo "$as_me:20275: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -20274,7 +20280,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20277 "configure"
++#line 20283 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20296,16 +20302,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20299: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20305: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20302: \$? = $ac_status" >&5
++  echo "$as_me:20308: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20305: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20308: \$? = $ac_status" >&5
++  echo "$as_me:20314: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -20313,7 +20319,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20316 "configure"
++#line 20322 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20335,16 +20341,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20344: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20341: \$? = $ac_status" >&5
++  echo "$as_me:20347: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20350: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20347: \$? = $ac_status" >&5
++  echo "$as_me:20353: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -20359,7 +20365,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20362: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:20368: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case $cf_cv_func_vsscanf in
+@@ -20385,23 +20391,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20388: checking for $ac_header" >&5
++echo "$as_me:20394: 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 20394 "configure"
++#line 20400 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20398: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20404: \"$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:20404: \$? = $ac_status" >&5
++  echo "$as_me:20410: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20420,7 +20426,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20423: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20429: 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 <&5
++echo "$as_me:20439: 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
+@@ -20441,7 +20447,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20444 "configure"
++#line 20450 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20482,15 +20488,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20485: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20491: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20488: \$? = $ac_status" >&5
++  echo "$as_me:20494: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20490: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20496: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20493: \$? = $ac_status" >&5
++  echo "$as_me:20499: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -20505,16 +20511,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:20508: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:20514: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:20511: checking for mkstemp" >&5
++	echo "$as_me:20517: 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 20517 "configure"
++#line 20523 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20545,16 +20551,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20548: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20554: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20551: \$? = $ac_status" >&5
++  echo "$as_me:20557: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20560: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20557: \$? = $ac_status" >&5
++  echo "$as_me:20563: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -20564,7 +20570,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20567: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:20573: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -20585,21 +20591,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:20588: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:20594: 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:20591: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:20597: 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:20597: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:20603: 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 20602 "configure"
++#line 20608 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -20616,15 +20622,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20619: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20625: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20622: \$? = $ac_status" >&5
++  echo "$as_me:20628: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:20624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20630: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20627: \$? = $ac_status" >&5
++  echo "$as_me:20633: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -20637,7 +20643,7 @@
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:20640: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:20646: 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
+ 
+@@ -20648,13 +20654,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:20651: checking for intptr_t" >&5
++echo "$as_me:20657: checking for intptr_t" >&5
+ echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
+ if test "${ac_cv_type_intptr_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20657 "configure"
++#line 20663 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -20669,16 +20675,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20672: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20675: \$? = $ac_status" >&5
++  echo "$as_me:20681: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20678: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20681: \$? = $ac_status" >&5
++  echo "$as_me:20687: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -20688,7 +20694,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:20691: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:20697: result: $ac_cv_type_intptr_t" >&5
+ echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
+ if test $ac_cv_type_intptr_t = yes; then
+   :
+@@ -20700,13 +20706,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20703: checking for ssize_t" >&5
++echo "$as_me:20709: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 20709 "configure"
++#line 20715 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -20721,16 +20727,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20724: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20730: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20727: \$? = $ac_status" >&5
++  echo "$as_me:20733: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20736: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20733: \$? = $ac_status" >&5
++  echo "$as_me:20739: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -20740,7 +20746,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:20743: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:20749: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test $ac_cv_type_ssize_t = yes; then
+   :
+@@ -20752,14 +20758,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20755: checking for type sigaction_t" >&5
++echo "$as_me:20761: 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 20762 "configure"
++#line 20768 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20772,16 +20778,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20781: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20778: \$? = $ac_status" >&5
++  echo "$as_me:20784: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20787: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20784: \$? = $ac_status" >&5
++  echo "$as_me:20790: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -20792,14 +20798,14 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:20795: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:20801: 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:20802: checking declaration of size-change" >&5
++echo "$as_me:20808: 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
+@@ -20820,7 +20826,7 @@
+ 
+ 	fi
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20823 "configure"
++#line 20829 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -20849,13 +20855,17 @@
+ 
+ #ifdef TIOCGSIZE
+ 	struct ttysize win;	/* SunOS 3.0... */
+-	int y = win.ts_lines;
+-	int x = win.ts_cols;
++	int y = win.ts_lines = 2;
++	int x = win.ts_cols = 1;
++	(void)y;
++	(void)x;
+ #else
+ #ifdef TIOCGWINSZ
+ 	struct winsize win;	/* everything else */
+-	int y = win.ws_row;
+-	int x = win.ws_col;
++	int y = win.ws_row = 2;
++	int x = win.ws_col = 1;
++	(void)y;
++	(void)x;
+ #else
+ 	no TIOCGSIZE or TIOCGWINSZ
+ #endif /* TIOCGWINSZ */
+@@ -20866,16 +20876,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20869: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20879: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20872: \$? = $ac_status" >&5
++  echo "$as_me:20882: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20875: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20878: \$? = $ac_status" >&5
++  echo "$as_me:20888: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -20894,7 +20904,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20897: result: $cf_cv_sizechange" >&5
++echo "$as_me:20907: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -20912,13 +20922,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:20915: checking for memmove" >&5
++echo "$as_me:20925: 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 20921 "configure"
++#line 20931 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20949,16 +20959,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20952: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20962: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20955: \$? = $ac_status" >&5
++  echo "$as_me:20965: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20958: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20968: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20961: \$? = $ac_status" >&5
++  echo "$as_me:20971: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -20968,19 +20978,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:20971: result: $ac_cv_func_memmove" >&5
++echo "$as_me:20981: 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:20977: checking for bcopy" >&5
++echo "$as_me:20987: 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 20983 "configure"
++#line 20993 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21011,16 +21021,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21017: \$? = $ac_status" >&5
++  echo "$as_me:21027: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21023: \$? = $ac_status" >&5
++  echo "$as_me:21033: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -21030,11 +21040,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21033: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:21043: 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:21037: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:21047: 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
+@@ -21044,7 +21054,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21047 "configure"
++#line 21057 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -21058,15 +21068,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21071: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21064: \$? = $ac_status" >&5
++  echo "$as_me:21074: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21076: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21069: \$? = $ac_status" >&5
++  echo "$as_me:21079: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -21079,7 +21089,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21082: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:21092: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -21106,13 +21116,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:21109: checking for $ac_func" >&5
++echo "$as_me:21119: 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 21115 "configure"
++#line 21125 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21143,16 +21153,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21146: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21149: \$? = $ac_status" >&5
++  echo "$as_me:21159: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21152: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21155: \$? = $ac_status" >&5
++  echo "$as_me:21165: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21162,7 +21172,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21165: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:21175: 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 <&5
++echo "$as_me:21185: 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
+@@ -21182,7 +21192,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21185 "configure"
++#line 21195 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21234,15 +21244,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21247: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21240: \$? = $ac_status" >&5
++  echo "$as_me:21250: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21242: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21252: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21245: \$? = $ac_status" >&5
++  echo "$as_me:21255: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -21254,21 +21264,21 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21257: result: $cf_cv_working_poll" >&5
++echo "$as_me:21267: result: $cf_cv_working_poll" >&5
+ echo "${ECHO_T}$cf_cv_working_poll" >&6
+ test "$cf_cv_working_poll" = "yes" &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_WORKING_POLL 1
+ EOF
+ 
+-echo "$as_me:21264: checking for va_copy" >&5
++echo "$as_me:21274: checking for va_copy" >&5
+ echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21271 "configure"
++#line 21281 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21285,16 +21295,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21288: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21298: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21291: \$? = $ac_status" >&5
++  echo "$as_me:21301: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21294: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21304: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21297: \$? = $ac_status" >&5
++  echo "$as_me:21307: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -21304,7 +21314,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21307: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:21317: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -21316,14 +21326,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:21319: checking for __va_copy" >&5
++echo "$as_me:21329: checking for __va_copy" >&5
+ echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21326 "configure"
++#line 21336 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21340,16 +21350,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21343: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21353: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21346: \$? = $ac_status" >&5
++  echo "$as_me:21356: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21352: \$? = $ac_status" >&5
++  echo "$as_me:21362: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -21359,7 +21369,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21362: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:21372: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -21371,14 +21381,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:21374: checking for __builtin_va_copy" >&5
++echo "$as_me:21384: checking for __builtin_va_copy" >&5
+ echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___builtin_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21381 "configure"
++#line 21391 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21395,16 +21405,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21398: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21408: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21401: \$? = $ac_status" >&5
++  echo "$as_me:21411: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21414: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21407: \$? = $ac_status" >&5
++  echo "$as_me:21417: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -21414,7 +21424,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21417: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:21427: result: $cf_cv_have___builtin_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
+ 
+ test "$cf_cv_have___builtin_va_copy" = yes &&
+@@ -21432,14 +21442,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:21435: checking if we can simply copy va_list" >&5
++	echo "$as_me:21445: checking if we can simply copy va_list" >&5
+ echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
+ if test "${cf_cv_pointer_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21442 "configure"
++#line 21452 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21456,16 +21466,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21469: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21462: \$? = $ac_status" >&5
++  echo "$as_me:21472: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21475: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21468: \$? = $ac_status" >&5
++  echo "$as_me:21478: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -21475,19 +21485,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21478: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:21488: result: $cf_cv_pointer_va_list" >&5
+ echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
+ 
+ 	if test "$cf_cv_pointer_va_list" = no
+ 	then
+-		echo "$as_me:21483: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:21493: checking if we can copy va_list indirectly" >&5
+ echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
+ if test "${cf_cv_array_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21490 "configure"
++#line 21500 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21504,16 +21514,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21507: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21517: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21510: \$? = $ac_status" >&5
++  echo "$as_me:21520: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21516: \$? = $ac_status" >&5
++  echo "$as_me:21526: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -21523,7 +21533,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21526: result: $cf_cv_array_va_list" >&5
++echo "$as_me:21536: result: $cf_cv_array_va_list" >&5
+ echo "${ECHO_T}$cf_cv_array_va_list" >&6
+ 		test "$cf_cv_array_va_list" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21534,13 +21544,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:21537: checking for pid_t" >&5
++echo "$as_me:21547: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21543 "configure"
++#line 21553 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21555,16 +21565,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21558: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21568: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21561: \$? = $ac_status" >&5
++  echo "$as_me:21571: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:21564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21574: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21567: \$? = $ac_status" >&5
++  echo "$as_me:21577: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -21574,7 +21584,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:21577: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:21587: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+   :
+@@ -21589,23 +21599,23 @@
+ for ac_header in unistd.h vfork.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:21592: checking for $ac_header" >&5
++echo "$as_me:21602: 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 21598 "configure"
++#line 21608 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:21602: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:21612: \"$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:21608: \$? = $ac_status" >&5
++  echo "$as_me:21618: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21624,7 +21634,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:21627: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:21637: 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 <&5
++echo "$as_me:21650: 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 21646 "configure"
++#line 21656 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21674,16 +21684,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21677: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21687: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21680: \$? = $ac_status" >&5
++  echo "$as_me:21690: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21693: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21686: \$? = $ac_status" >&5
++  echo "$as_me:21696: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21693,7 +21703,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:21696: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:21706: 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 <&5
++  echo "$as_me:21718: checking for working fork" >&5
+ echo $ECHO_N "checking for working fork... $ECHO_C" >&6
+ if test "${ac_cv_func_fork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21728,15 +21738,15 @@
+       }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21731: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21741: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21734: \$? = $ac_status" >&5
++  echo "$as_me:21744: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21736: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21739: \$? = $ac_status" >&5
++  echo "$as_me:21749: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -21748,7 +21758,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21751: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:21761: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -21762,12 +21772,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:21765: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:21775: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
+ fi
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ if test "x$ac_cv_func_vfork" = xyes; then
+-  echo "$as_me:21770: checking for working vfork" >&5
++  echo "$as_me:21780: checking for working vfork" >&5
+ echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
+ if test "${ac_cv_func_vfork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21776,7 +21786,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21779 "configure"
++#line 21789 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -21873,15 +21883,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21876: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21886: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21879: \$? = $ac_status" >&5
++  echo "$as_me:21889: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21891: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21884: \$? = $ac_status" >&5
++  echo "$as_me:21894: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -21893,13 +21903,13 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:21896: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:21906: result: $ac_cv_func_vfork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+ 
+ fi;
+ if test "x$ac_cv_func_fork_works" = xcross; then
+   ac_cv_func_vfork_works=ac_cv_func_vfork
+-  { echo "$as_me:21902: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:21912: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
+ fi
+ 
+@@ -21924,7 +21934,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21927: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:21937: checking if fopen accepts explicit binary mode" >&5
+ echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
+ if test "${cf_cv_fopen_bin_r+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21934,7 +21944,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 21937 "configure"
++#line 21947 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21967,15 +21977,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21970: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21973: \$? = $ac_status" >&5
++  echo "$as_me:21983: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:21975: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21985: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21978: \$? = $ac_status" >&5
++  echo "$as_me:21988: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -21988,7 +21998,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21991: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:22001: result: $cf_cv_fopen_bin_r" >&5
+ echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
+ test "x$cf_cv_fopen_bin_r" != xno &&
+ cat >>confdefs.h <<\EOF
+@@ -21997,7 +22007,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:22000: checking for openpty in -lutil" >&5
++echo "$as_me:22010: 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
+@@ -22005,7 +22015,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 22008 "configure"
++#line 22018 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22024,16 +22034,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22027: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22037: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22030: \$? = $ac_status" >&5
++  echo "$as_me:22040: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22033: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22043: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22036: \$? = $ac_status" >&5
++  echo "$as_me:22046: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -22044,7 +22054,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22047: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:22057: 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
+@@ -22052,7 +22062,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:22055: checking for openpty header" >&5
++echo "$as_me:22065: 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
+@@ -22079,7 +22089,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22082 "configure"
++#line 22092 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -22096,16 +22106,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22099: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22109: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22102: \$? = $ac_status" >&5
++  echo "$as_me:22112: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22105: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22115: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22108: \$? = $ac_status" >&5
++  echo "$as_me:22118: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -22123,7 +22133,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:22126: result: $cf_cv_func_openpty" >&5
++echo "$as_me:22136: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -22196,7 +22206,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 22199 "configure"
++#line 22209 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22208,16 +22218,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22221: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22214: \$? = $ac_status" >&5
++  echo "$as_me:22224: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22227: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22220: \$? = $ac_status" >&5
++  echo "$as_me:22230: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -22234,7 +22244,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:22237: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:22247: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -22270,7 +22280,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}:22273: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:22283: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -22281,7 +22291,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:22284: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:22294: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -22353,7 +22363,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 22356 "configure"
++#line 22366 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22365,16 +22375,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22368: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22378: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22371: \$? = $ac_status" >&5
++  echo "$as_me:22381: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22374: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22384: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22377: \$? = $ac_status" >&5
++  echo "$as_me:22387: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -22391,7 +22401,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:22394: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:22404: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -22471,7 +22481,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}:22474: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:22484: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -22488,23 +22498,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:22491: checking for db.h" >&5
++echo "$as_me:22501: 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 22497 "configure"
++#line 22507 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:22501: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:22511: \"$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:22507: \$? = $ac_status" >&5
++  echo "$as_me:22517: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22523,11 +22533,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:22526: result: $ac_cv_header_db_h" >&5
++echo "$as_me:22536: 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:22530: checking for version of db" >&5
++echo "$as_me:22540: 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
+@@ -22538,10 +22548,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:22541: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:22551: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22544 "configure"
++#line 22554 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22571,16 +22581,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22574: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22584: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22577: \$? = $ac_status" >&5
++  echo "$as_me:22587: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22583: \$? = $ac_status" >&5
++  echo "$as_me:22593: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -22594,16 +22604,16 @@
+ done
+ 
+ fi
+-echo "$as_me:22597: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:22607: 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:22601: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:22611: 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:22606: checking for db libraries" >&5
++echo "$as_me:22616: 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
+@@ -22633,10 +22643,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:22636: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:22646: testing checking for library "$cf_db_libs" ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22639 "configure"
++#line 22649 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22691,16 +22701,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22694: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22704: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22697: \$? = $ac_status" >&5
++  echo "$as_me:22707: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22700: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22703: \$? = $ac_status" >&5
++  echo "$as_me:22713: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -22720,11 +22730,11 @@
+ done
+ 
+ fi
+-echo "$as_me:22723: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:22733: 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:22727: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:22737: 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
+@@ -22750,7 +22760,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:22753: error: Cannot find db.h" >&5
++	{ { echo "$as_me:22763: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -22765,7 +22775,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:22768: checking if we should include stdbool.h" >&5
++echo "$as_me:22778: 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
+@@ -22773,7 +22783,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22776 "configure"
++#line 22786 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -22785,23 +22795,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22788: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22798: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22791: \$? = $ac_status" >&5
++  echo "$as_me:22801: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22804: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22797: \$? = $ac_status" >&5
++  echo "$as_me:22807: \$? = $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 22804 "configure"
++#line 22814 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -22817,16 +22827,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22820: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22830: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22823: \$? = $ac_status" >&5
++  echo "$as_me:22833: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22826: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22829: \$? = $ac_status" >&5
++  echo "$as_me:22839: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -22840,13 +22850,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:22843: result: yes" >&5
++then	echo "$as_me:22853: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22845: result: no" >&5
++else	echo "$as_me:22855: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:22849: checking for builtin bool type" >&5
++echo "$as_me:22859: 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
+@@ -22854,7 +22864,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22857 "configure"
++#line 22867 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22869,16 +22879,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:22872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22882: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22875: \$? = $ac_status" >&5
++  echo "$as_me:22885: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:22878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22888: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22881: \$? = $ac_status" >&5
++  echo "$as_me:22891: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -22891,9 +22901,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:22894: result: yes" >&5
++then	echo "$as_me:22904: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:22896: result: no" >&5
++else	echo "$as_me:22906: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -22910,10 +22920,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:22913: checking if we already have C++ library" >&5
++	echo "$as_me:22923: checking if we already have C++ library" >&5
+ echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 22916 "configure"
++#line 22926 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -22927,16 +22937,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:22930: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22940: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22933: \$? = $ac_status" >&5
++  echo "$as_me:22943: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:22936: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22946: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22939: \$? = $ac_status" >&5
++  echo "$as_me:22949: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -22945,7 +22955,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-	echo "$as_me:22948: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:22958: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -22964,7 +22974,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:22967: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:22977: 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
+@@ -22990,7 +23000,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 22993 "configure"
++#line 23003 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -23004,16 +23014,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:23007: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23017: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23010: \$? = $ac_status" >&5
++  echo "$as_me:23020: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:23013: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23016: \$? = $ac_status" >&5
++  echo "$as_me:23026: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -23025,7 +23035,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:23028: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:23038: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -23047,7 +23057,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:23050: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:23060: 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
+@@ -23062,15 +23072,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 $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:23065: \"$ac_try\"") >&5
++if { (eval echo "$as_me:23075: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23068: \$? = $ac_status" >&5
++  echo "$as_me:23078: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:23070: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:23080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23073: \$? = $ac_status" >&5
++  echo "$as_me:23083: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -23081,10 +23091,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+-  echo "$as_me:23084: result: yes" >&5
++  echo "$as_me:23094: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:23087: result: no" >&5
++  echo "$as_me:23097: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23104,7 +23114,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:23107: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:23117: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -23125,7 +23135,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23128 "configure"
++#line 23138 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -23139,16 +23149,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:23142: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23152: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23145: \$? = $ac_status" >&5
++  echo "$as_me:23155: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:23148: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23158: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23151: \$? = $ac_status" >&5
++  echo "$as_me:23161: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -23185,7 +23195,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 23188 "configure"
++#line 23198 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23199,16 +23209,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:23202: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23212: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23205: \$? = $ac_status" >&5
++  echo "$as_me:23215: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:23208: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23218: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23211: \$? = $ac_status" >&5
++  echo "$as_me:23221: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -23241,7 +23251,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save"
+-	echo "$as_me:23244: result: $cf_cxx_library" >&5
++	echo "$as_me:23254: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -23257,7 +23267,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:23260: checking how to run the C++ preprocessor" >&5
++echo "$as_me:23270: 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
+@@ -23274,18 +23284,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 23277 "configure"
++#line 23287 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:23282: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23292: \"$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:23288: \$? = $ac_status" >&5
++  echo "$as_me:23298: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23308,17 +23318,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23311 "configure"
++#line 23321 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23315: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23325: \"$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:23321: \$? = $ac_status" >&5
++  echo "$as_me:23331: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23355,7 +23365,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:23358: result: $CXXCPP" >&5
++echo "$as_me:23368: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -23365,18 +23375,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 23368 "configure"
++#line 23378 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:23373: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23383: \"$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:23379: \$? = $ac_status" >&5
++  echo "$as_me:23389: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23399,17 +23409,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23402 "configure"
++#line 23412 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23406: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23416: \"$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:23412: \$? = $ac_status" >&5
++  echo "$as_me:23422: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23437,7 +23447,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:23440: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:23450: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -23452,23 +23462,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23455: checking for $ac_header" >&5
++echo "$as_me:23465: 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 23461 "configure"
++#line 23471 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23465: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23475: \"$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:23471: \$? = $ac_status" >&5
++  echo "$as_me:23481: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23487,7 +23497,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:23490: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:23500: 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 <&5
++echo "$as_me:23513: 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 23509 "configure"
++#line 23519 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23513: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:23523: \"$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:23519: \$? = $ac_status" >&5
++  echo "$as_me:23529: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -23535,7 +23545,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:23538: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:23548: 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 <&5
++	echo "$as_me:23559: 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 23552 "configure"
++#line 23562 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23566,16 +23576,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23572: \$? = $ac_status" >&5
++  echo "$as_me:23582: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23578: \$? = $ac_status" >&5
++  echo "$as_me:23588: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -23584,7 +23594,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:23587: result: $cf_iostream_namespace" >&5
++	echo "$as_me:23597: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -23595,7 +23605,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:23598: checking if we should include stdbool.h" >&5
++echo "$as_me:23608: 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
+@@ -23603,7 +23613,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23606 "configure"
++#line 23616 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23615,23 +23625,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23618: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23628: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23621: \$? = $ac_status" >&5
++  echo "$as_me:23631: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23627: \$? = $ac_status" >&5
++  echo "$as_me:23637: \$? = $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 23634 "configure"
++#line 23644 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -23647,16 +23657,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23650: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23660: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23653: \$? = $ac_status" >&5
++  echo "$as_me:23663: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23656: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23666: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23659: \$? = $ac_status" >&5
++  echo "$as_me:23669: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -23670,13 +23680,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:23673: result: yes" >&5
++then	echo "$as_me:23683: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:23675: result: no" >&5
++else	echo "$as_me:23685: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:23679: checking for builtin bool type" >&5
++echo "$as_me:23689: 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
+@@ -23684,7 +23694,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23687 "configure"
++#line 23697 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23699,16 +23709,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23702: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23712: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23705: \$? = $ac_status" >&5
++  echo "$as_me:23715: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23718: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23711: \$? = $ac_status" >&5
++  echo "$as_me:23721: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -23721,13 +23731,13 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:23724: result: yes" >&5
++then	echo "$as_me:23734: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:23726: result: no" >&5
++else	echo "$as_me:23736: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:23730: checking for size of bool" >&5
++echo "$as_me:23740: 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
+@@ -23738,7 +23748,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23741 "configure"
++#line 23751 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23780,15 +23790,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23793: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23786: \$? = $ac_status" >&5
++  echo "$as_me:23796: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23798: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23791: \$? = $ac_status" >&5
++  echo "$as_me:23801: \$? = $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
+@@ -23806,18 +23816,18 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:23809: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:23819: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:23815: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:23825: 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:23820: checking for special defines needed for etip.h" >&5
++echo "$as_me:23830: 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"
+@@ -23835,7 +23845,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 23838 "configure"
++#line 23848 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23849,16 +23859,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:23852: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23862: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23855: \$? = $ac_status" >&5
++  echo "$as_me:23865: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:23858: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23868: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23861: \$? = $ac_status" >&5
++  echo "$as_me:23871: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:23892: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:23887: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:23897: 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
+@@ -23901,7 +23911,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 23904 "configure"
++#line 23914 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -23920,15 +23930,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:23923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23933: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23926: \$? = $ac_status" >&5
++  echo "$as_me:23936: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:23928: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23938: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23931: \$? = $ac_status" >&5
++  echo "$as_me:23941: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -23947,7 +23957,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:23950: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:23960: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -23957,7 +23967,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:23960: checking if $CXX accepts static_cast" >&5
++echo "$as_me:23970: 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
+@@ -23971,7 +23981,7 @@
+ ac_main_return=return
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 23974 "configure"
++#line 23984 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -24015,16 +24025,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24018: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24028: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24021: \$? = $ac_status" >&5
++  echo "$as_me:24031: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24027: \$? = $ac_status" >&5
++  echo "$as_me:24037: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -24042,7 +24052,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:24045: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:24055: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -24091,7 +24101,7 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:24094: checking for size of bool" >&5
++echo "$as_me:24104: 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
+@@ -24102,7 +24112,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 24105 "configure"
++#line 24115 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24144,15 +24154,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:24147: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24157: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24150: \$? = $ac_status" >&5
++  echo "$as_me:24160: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:24152: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24155: \$? = $ac_status" >&5
++  echo "$as_me:24165: \$? = $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
+@@ -24170,25 +24180,25 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:24173: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:24183: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:24179: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:24189: 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:24185: checking for fallback type of bool" >&5
++			echo "$as_me:24195: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ 			case "$host_cpu" in
+ 			(i?86)	cf_cv_type_of_bool=char	;;
+ 			(*)	cf_cv_type_of_bool=int	;;
+ 			esac
+-			echo "$as_me:24191: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:24201: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -24217,7 +24227,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:24220: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:24230: 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
+@@ -24234,7 +24244,7 @@
+ 	unset cf_TEMP_gnat
+ 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:24237: checking for $ac_word" >&5
++echo "$as_me:24247: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24251,7 +24261,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+-   echo "$as_me:24254: found $ac_dir/$ac_word" >&5
++   echo "$as_me:24264: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -24263,10 +24273,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:24266: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:24276: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:24269: result: no" >&5
++  echo "$as_me:24279: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24276,7 +24286,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:24279: checking for $cf_prog_gnat version" >&5
++echo "$as_me:24289: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24287,7 +24297,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:24290: result: $cf_cv_gnat_version" >&5
++echo "$as_me:24300: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -24316,7 +24326,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:24319: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:24329: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test $cf_gprconfig = C
+ 				then
+@@ -24335,10 +24345,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
+-					echo "$as_me:24338: result: $cf_gprconfig_value" >&5
++					echo "$as_me:24348: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:24341: result: missing" >&5
++					echo "$as_me:24351: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -24351,7 +24361,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:24354: checking for gnat version" >&5
++echo "$as_me:24364: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24362,7 +24372,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:24365: result: $cf_cv_gnat_version" >&5
++echo "$as_me:24375: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ 
+@@ -24371,7 +24381,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:24374: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:24384: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -24379,7 +24389,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:24382: checking for $ac_word" >&5
++echo "$as_me:24392: 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
+@@ -24394,7 +24404,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:24397: found $ac_dir/$ac_word" >&5
++echo "$as_me:24407: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -24403,20 +24413,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:24406: result: $M4_exists" >&5
++  echo "$as_me:24416: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:24409: result: no" >&5
++  echo "$as_me:24419: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$ac_cv_prog_M4_exists" = no; then
+ 			cf_cv_prog_gnat_correct=no
+-			{ echo "$as_me:24415: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:24425: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ 		fi
+ 		if test "$cf_cv_prog_gnat_correct" = yes; then
+-			echo "$as_me:24419: checking if GNAT works" >&5
++			echo "$as_me:24429: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf conftest* *~conftest*
+@@ -24444,7 +24454,7 @@
+ fi
+ rm -rf conftest* *~conftest*
+ 
+-			echo "$as_me:24447: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:24457: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -24456,7 +24466,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:24459: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:24469: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -24473,10 +24483,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:24476: result: $ADAFLAGS" >&5
++	echo "$as_me:24486: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:24479: checking if GNATPREP supports -T option" >&5
++echo "$as_me:24489: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24486,11 +24496,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:24489: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:24499: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:24493: checking if GNAT supports generics" >&5
++echo "$as_me:24503: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case $cf_cv_gnat_version in
+ (3.[1-9]*|[4-9].*)
+@@ -24500,7 +24510,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:24503: result: $cf_gnat_generics" >&5
++echo "$as_me:24513: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -24512,7 +24522,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:24515: checking if GNAT supports SIGINT" >&5
++echo "$as_me:24525: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24560,7 +24570,7 @@
+ rm -rf conftest* *~conftest*
+ 
+ fi
+-echo "$as_me:24563: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:24573: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -24573,7 +24583,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:24576: checking if GNAT supports project files" >&5
++echo "$as_me:24586: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case $cf_cv_gnat_version in
+ (3.[0-9]*)
+@@ -24636,15 +24646,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:24639: result: $cf_gnat_projects" >&5
++echo "$as_me:24649: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test $cf_gnat_projects = yes
+ then
+-	echo "$as_me:24645: checking if GNAT supports libraries" >&5
++	echo "$as_me:24655: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:24647: result: $cf_gnat_libraries" >&5
++	echo "$as_me:24657: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -24664,7 +24674,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:24667: checking for ada-compiler" >&5
++echo "$as_me:24677: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -24675,12 +24685,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:24678: result: $cf_ada_compiler" >&5
++echo "$as_me:24688: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:24683: checking for ada-include" >&5
++echo "$as_me:24693: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -24716,7 +24726,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:24719: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:24729: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -24725,10 +24735,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:24728: result: $ADA_INCLUDE" >&5
++echo "$as_me:24738: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:24731: checking for ada-objects" >&5
++echo "$as_me:24741: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -24764,7 +24774,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:24767: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:24777: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -24773,10 +24783,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:24776: result: $ADA_OBJECTS" >&5
++echo "$as_me:24786: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:24779: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:24789: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -24786,14 +24796,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:24789: result: $with_ada_sharedlib" >&5
++echo "$as_me:24799: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:24796: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:24806: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -24813,7 +24823,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:24816: checking for ada-libname" >&5
++echo "$as_me:24826: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -24829,7 +24839,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24832: result: $ADA_LIBNAME" >&5
++echo "$as_me:24842: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -24840,13 +24850,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:24843: checking for wchar_t" >&5
++	echo "$as_me:24853: checking for wchar_t" >&5
+ echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_type_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 24849 "configure"
++#line 24859 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24861,16 +24871,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24864: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24874: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24867: \$? = $ac_status" >&5
++  echo "$as_me:24877: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24880: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24873: \$? = $ac_status" >&5
++  echo "$as_me:24883: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -24880,10 +24890,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:24883: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:24893: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:24886: checking size of wchar_t" >&5
++echo "$as_me:24896: checking size of wchar_t" >&5
+ echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24892,7 +24902,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 24895 "configure"
++#line 24905 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24904,21 +24914,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24907: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24917: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24910: \$? = $ac_status" >&5
++  echo "$as_me:24920: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24923: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24916: \$? = $ac_status" >&5
++  echo "$as_me:24926: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 24921 "configure"
++#line 24931 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24930,16 +24940,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24933: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24943: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24936: \$? = $ac_status" >&5
++  echo "$as_me:24946: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24939: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24949: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24942: \$? = $ac_status" >&5
++  echo "$as_me:24952: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -24955,7 +24965,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 24958 "configure"
++#line 24968 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24967,16 +24977,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:24970: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24980: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24973: \$? = $ac_status" >&5
++  echo "$as_me:24983: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:24976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24979: \$? = $ac_status" >&5
++  echo "$as_me:24989: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -24992,7 +25002,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 24995 "configure"
++#line 25005 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -25004,16 +25014,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:25007: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25017: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25010: \$? = $ac_status" >&5
++  echo "$as_me:25020: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:25013: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25016: \$? = $ac_status" >&5
++  echo "$as_me:25026: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -25026,12 +25036,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:25029: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:25039: 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 25034 "configure"
++#line 25044 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -25047,15 +25057,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:25050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25060: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25053: \$? = $ac_status" >&5
++  echo "$as_me:25063: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:25055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25065: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25058: \$? = $ac_status" >&5
++  echo "$as_me:25068: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -25071,7 +25081,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:25074: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:25084: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:25087: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:25097: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -25102,7 +25112,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:25105: checking for library subsets" >&5
++echo "$as_me:25115: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -25144,7 +25154,7 @@
+ test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+ 
+-echo "$as_me:25147: result: $LIB_SUBSETS" >&5
++echo "$as_me:25157: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -25175,7 +25185,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:25178: checking default library suffix" >&5
++echo "$as_me:25188: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -25186,10 +25196,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:25189: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:25199: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:25192: checking default library-dependency suffix" >&5
++echo "$as_me:25202: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -25247,10 +25257,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:25250: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:25260: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:25253: checking default object directory" >&5
++echo "$as_me:25263: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -25266,11 +25276,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:25269: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:25279: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:25273: checking c++ library-dependency suffix" >&5
++echo "$as_me:25283: checking c++ library-dependency suffix" >&5
+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
+ if test "$with_libtool" != "no"; then
+ 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
+@@ -25338,7 +25348,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:25341: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:25351: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -25514,19 +25524,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:25517: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:25527: checking if linker supports switching between static/dynamic" >&5
+ echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
+ 
+ 	rm -f libconftest.a
+ 	cat >conftest.$ac_ext <
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:25526: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:25536: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25529: \$? = $ac_status" >&5
++  echo "$as_me:25539: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -25537,10 +25547,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 25540 "configure"
++#line 25550 "configure"
+ #include "confdefs.h"
+ 
+-#line 25543 "configure"
++#line 25553 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -25555,16 +25565,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:25558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25568: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25561: \$? = $ac_status" >&5
++  echo "$as_me:25571: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:25564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25574: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25567: \$? = $ac_status" >&5
++  echo "$as_me:25577: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -25587,7 +25597,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:25590: result: $cf_ldflags_static" >&5
++	echo "$as_me:25600: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test $cf_ldflags_static != yes
+@@ -25603,7 +25613,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:25606: checking where we will install curses.h" >&5
++echo "$as_me:25616: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -25613,7 +25623,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:25616: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:25626: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -25621,7 +25631,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:25624: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:25634: 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
+@@ -25638,7 +25648,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:25641: checking for desired basename for form library" >&5
++echo "$as_me:25651: checking for desired basename for form library" >&5
+ echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
+ 
+ # Check whether --with-form-libname or --without-form-libname was given.
+@@ -25658,10 +25668,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:25661: result: $FORM_NAME" >&5
++echo "$as_me:25671: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:25664: checking for desired basename for menu library" >&5
++echo "$as_me:25674: checking for desired basename for menu library" >&5
+ echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
+ 
+ # Check whether --with-menu-libname or --without-menu-libname was given.
+@@ -25681,10 +25691,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:25684: result: $MENU_NAME" >&5
++echo "$as_me:25694: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:25687: checking for desired basename for panel library" >&5
++echo "$as_me:25697: checking for desired basename for panel library" >&5
+ echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
+ 
+ # Check whether --with-panel-libname or --without-panel-libname was given.
+@@ -25704,10 +25714,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:25707: result: $PANEL_NAME" >&5
++echo "$as_me:25717: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:25710: checking for desired basename for cxx library" >&5
++echo "$as_me:25720: checking for desired basename for cxx library" >&5
+ echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-libname or --without-cxx-libname was given.
+@@ -25727,13 +25737,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:25730: result: $CXX_NAME" >&5
++echo "$as_me:25740: result: $CXX_NAME" >&5
+ echo "${ECHO_T}$CXX_NAME" >&6
+ 
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:25736: checking for src modules" >&5
++echo "$as_me:25746: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -25802,7 +25812,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:25805: result: $cf_cv_src_modules" >&5
++echo "$as_me:25815: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -26063,7 +26073,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:26066: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:26076: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+ 
+ 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
+@@ -26074,7 +26084,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:26077: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:26087: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -26090,7 +26100,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:26093: result: $PKG_CFLAGS" >&5
++echo "$as_me:26103: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -26151,7 +26161,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
+ 
+-echo "${as_me:-configure}:26154: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:26164: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -26178,7 +26188,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:26181: checking for linker search path" >&5
++echo "$as_me:26191: checking for linker search path" >&5
+ echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
+ if test "${cf_cv_ld_searchpath+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26242,7 +26252,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:26245: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:26255: result: $cf_cv_ld_searchpath" >&5
+ echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
+ 
+ LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
+@@ -26332,7 +26342,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:26335: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:26345: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -26508,7 +26518,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:26511: error: ambiguous option: $1
++    { { echo "$as_me:26521: 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;}
+@@ -26527,7 +26537,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:26530: error: unrecognized option: $1
++  -*) { { echo "$as_me:26540: 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;}
+@@ -26650,7 +26660,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:26653: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:26663: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -27146,7 +27156,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:27149: creating $ac_file" >&5
++    { echo "$as_me:27159: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -27164,7 +27174,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:27167: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:27177: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -27177,7 +27187,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:27180: error: cannot find input file: $f" >&5
++           { { echo "$as_me:27190: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -27193,7 +27203,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:27196: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:27206: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -27202,7 +27212,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:27205: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:27215: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -27239,7 +27249,7 @@
+             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:27242: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:27252: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -27250,7 +27260,7 @@
+     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:27253: WARNING: Some variables may not be substituted:
++      { echo "$as_me:27263: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -27299,7 +27309,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:27302: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:27312: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -27310,7 +27320,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:27313: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:27323: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -27323,7 +27333,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:27326: error: cannot find input file: $f" >&5
++           { { echo "$as_me:27336: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -27381,7 +27391,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:27384: $ac_file is unchanged" >&5
++      { echo "$as_me:27394: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -27739,7 +27749,7 @@
+ 				(cygdll|msysdll|mingw)
+ 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
+ 
+-echo "${as_me:-configure}:27742: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:27752: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1341 
+--- ncurses-6.2-20200314+/dist.mk	2020-03-14 15:30:00.000000000 +0000
++++ ncurses-6.2-20200321/dist.mk	2020-03-21 12:15:18.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1341 2020/03/14 15:30:00 tom Exp $
++# $Id: dist.mk,v 1.1342 2020/03/21 12:15:18 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 2
+-NCURSES_PATCH = 20200314
++NCURSES_PATCH = 20200321
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.2-20200314+/doc/html/man/adacurses6-config.1.html	2020-03-15 00:28:07.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/adacurses6-config.1.html	2020-03-22 00:34:59.000000000 +0000
+@@ -126,7 +126,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.2-20200314+/doc/html/man/captoinfo.1m.html	2020-03-15 00:28:07.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/captoinfo.1m.html	2020-03-22 00:34:59.000000000 +0000
+@@ -199,7 +199,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.2-20200314+/doc/html/man/clear.1.html	2020-03-15 00:28:08.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/clear.1.html	2020-03-22 00:35:00.000000000 +0000
+@@ -149,7 +149,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+ 
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.2-20200314+/doc/html/man/curs_add_wch.3x.html	2020-02-03 01:26:24.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/curs_add_wch.3x.html	2020-03-22 00:35:00.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.26 2020/02/02 23:34:34 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.27 2020/03/22 00:25:15 tom Exp @
+ -->
+ 
+ 
+@@ -188,7 +188,24 @@
+

    RETURN VALUE

    +        All routines return the integer ERR upon failure and OK on success.
+ 
+-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
++       X/Open does not  define  any  error  conditions.   This  implementation
++       returns an error
++
++       o   if the window pointer is null or
++
++       o   if it is not possible to add a complete character in the window.
++
++       The latter may be due to different causes:
++
++       o   If  scrollok is not enabled, writing a character at the lower right
++           margin succeeds.  However, an error is returned because it  is  not
++           possible to wrap to a new line
++
++       o   If  an error is detected when converting a multibyte character to a
++           sequence of bytes, or if it is not  possible  to  add  all  of  the
++           resulting bytes in the window, an error is returned.
++
++       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+        wmove, and return an error if the position is outside the window, or if
+        the window pointer is null.
+ 
+@@ -198,71 +215,71 @@
+ 
+ 
+

    PORTABILITY

    +-       All of these functions are described in the XSI Curses standard,  Issue
+-       4.   The  defaults  specified  for line-drawing characters apply in the
++       All  of these functions are described in the XSI Curses standard, Issue
++       4.  The defaults specified for line-drawing  characters  apply  in  the
+        POSIX locale.
+ 
+-       X/Open Curses makes it clear that the WACS_ symbols should  be  defined
++       X/Open  Curses  makes it clear that the WACS_ symbols should be defined
+        as a pointer to cchar_t data, e.g., in the discussion of border_set.  A
+        few implementations are problematic:
+ 
+        o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
+ 
+        o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
+-           symbols  as  if  the ACS_ symbols were wide characters.  The misde-
+-           fined symbols are the arrows and other symbols which are  not  used
++           symbols as if the ACS_ symbols were wide  characters.   The  misde-
++           fined  symbols  are the arrows and other symbols which are not used
+            for line-drawing.
+ 
+        X/Open Curses does not define symbols for thick- or double-lines.  SVr4
+-       curses implementations defined their line-drawing symbols in  terms  of
+-       intermediate  symbols.  This implementation extends those symbols, pro-
++       curses  implementations  defined their line-drawing symbols in terms of
++       intermediate symbols.  This implementation extends those symbols,  pro-
+        viding new definitions which are not in the SVr4 implementations.
+ 
+-       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
++       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
+        alternate character sets (i.e., the acsc capability), with their corre-
+-       sponding line-drawing characters.  X/Open Curses did  not  address  the
+-       aspect  of  integrating Unicode with line-drawing characters.  Existing
+-       implementations of Unix curses (AIX, HPUX, Solaris) use only  the  acsc
+-       character-mapping  to  provide this feature.  As a result, those imple-
+-       mentations can only use single-byte line-drawing  characters.   Ncurses
+-       5.3  (2002) provided a table of Unicode values to solve these problems.
++       sponding  line-drawing  characters.   X/Open Curses did not address the
++       aspect of integrating Unicode with line-drawing  characters.   Existing
++       implementations  of  Unix curses (AIX, HPUX, Solaris) use only the acsc
++       character-mapping to provide this feature.  As a result,  those  imple-
++       mentations  can  only use single-byte line-drawing characters.  Ncurses
++       5.3 (2002) provided a table of Unicode values to solve these  problems.
+        NetBSD curses incorporated that table in 2010.
+ 
+        In this implementation, the Unicode values are used instead of the ter-
+-       minal  description's  acsc  mapping as discussed in ncurses(3x) for the
+-       environment variable NCURSES_NO_UTF8_ACS.  In contrast,  for  the  same
++       minal description's acsc mapping as discussed in  ncurses(3x)  for  the
++       environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the same
+        cases, the line-drawing characters described in curs_addch(3x) will use
+        only the ASCII default values.
+ 
+-       Having Unicode available does not solve all of the problems with  line-
++       Having  Unicode available does not solve all of the problems with line-
+        drawing for curses:
+ 
+-       o   The  closest  Unicode  equivalents to the VT100 graphics S1, S3, S7
+-           and S9 frequently are not displayed at the regular intervals  which
++       o   The closest Unicode equivalents to the VT100 graphics  S1,  S3,  S7
++           and  S9 frequently are not displayed at the regular intervals which
+            the terminal used.
+ 
+-       o   The  lantern  is  a special case.  It originated with the AT&T 4410
+-           terminal in the early 1980s.  There is no accessible  documentation
++       o   The lantern is a special case.  It originated with  the  AT&T  4410
++           terminal  in the early 1980s.  There is no accessible documentation
+            depicting the lantern symbol on the AT&T terminal.
+ 
+            Lacking documentation, most readers assume that a storm lantern was
+            intended.  But there are several possibilities, all with problems.
+ 
+-           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
+-           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
+-           since they lie outside the BMP and as a result  are  not  generally
++           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
++           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
++           since  they  lie  outside the BMP and as a result are not generally
+            available in terminals.  They are not storm lanterns, in any case.
+ 
+            Most storm lanterns have a tapering glass chimney (to guard against
+            tipping); some have a wire grid protecting the chimney.
+ 
+-           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
++           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
+            terminal, no one can tell what the image represents.  Unicode calls
+            it a snowman.
+ 
+-           Others have suggested these alternatives: S U+00A7 (section  mark),
++           Others  have suggested these alternatives: S U+00A7 (section mark),
+            O U+0398 (theta), O U+03A6 (phi), d U+03B4 (delta),  U+2327 (x in a
+-           rectangle),  U+256C (forms double  vertical  and  horizontal),  and
++           rectangle),   U+256C  (forms  double  vertical and horizontal), and
+            U+2612 (ballot box with x).
+ 
+ 
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.2-20200314+/doc/html/man/curs_addch.3x.html	2020-02-03 01:26:24.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/curs_addch.3x.html	2020-03-22 00:35:00.000000000 +0000
+@@ -28,7 +28,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.51 2020/02/02 23:34:34 tom Exp @
++  * @Id: curs_addch.3x,v 1.52 2020/03/21 23:47:23 tom Exp @
+ -->
+ 
+ 
+@@ -173,106 +173,117 @@
+        wmove, and return an error if the position is outside the window, or if
+        the window pointer is null.
+ 
++       If  it  is  not  possible  to  add  a  complete  character, an error is
++       returned:
++
++       o   If scrollok is not enabled, writing a character at the lower  right
++           margin  succeeds.   However, an error is returned because it is not
++           possible to wrap to a new line
++
++       o   If an error is detected when converting a multibyte character to  a
++           sequence  of  bytes,  or  if  it  is not possible to add all of the
++           resulting bytes in the window, an error is returned.
++
+ 
+

    NOTES

    +        Note that addch, mvaddch, mvwaddch, and echochar may be macros.
+ 
+ 
+

    PORTABILITY

    +-       All  these functions are described in the XSI Curses standard, Issue 4.
+-       The defaults specified for forms-drawing characters apply in the  POSIX
++       All these functions are described in the XSI Curses standard, Issue  4.
++       The  defaults specified for forms-drawing characters apply in the POSIX
+        locale.
+ 
+ 
+

    ACS Symbols

    +        X/Open Curses states that the ACS_ definitions are char constants.  For
+-       the wide-character implementation (see curs_add_wch), there are  analo-
+-       gous  WACS_  definitions which are cchar_t constants.  Some implementa-
++       the  wide-character implementation (see curs_add_wch), there are analo-
++       gous WACS_ definitions which are cchar_t constants.   Some  implementa-
+        tions are problematic:
+ 
+-       o   Some implementations define the ACS symbols to a constant (such  as
++       o   Some  implementations define the ACS symbols to a constant (such as
+            Solaris), while others define those to entries in an array.
+ 
+-           This  implementation uses an array acs_map, as done in SVr4 curses.
++           This implementation uses an array acs_map, as done in SVr4  curses.
+            NetBSD also uses an array, actually named _acs_char, with a #define
+            for compatibility.
+ 
+        o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
+-           symbols as if the ACS_ symbols were wide  characters.   The  misde-
+-           fined  symbols  are the arrows and other symbols which are not used
++           symbols  as  if  the ACS_ symbols were wide characters.  The misde-
++           fined symbols are the arrows and other symbols which are  not  used
+            for line-drawing.
+ 
+-       o   X/Open Curses (issues 2 through 7) has a  typographical  error  for
++       o   X/Open  Curses  (issues  2 through 7) has a typographical error for
+            the ACS_LANTERN symbol, equating its "VT100+ Character" to I (capi-
+-           tal I), while the header files for  SVr4  curses  and  the  various
++           tal  I),  while  the  header  files for SVr4 curses and the various
+            implementations use i (lowercase).
+ 
+-           None  of the terminal descriptions on Unix platforms use uppercase-
+-           I, except for Solaris (i.e., screen's terminal description,  appar-
++           None of the terminal descriptions on Unix platforms use  uppercase-
++           I,  except for Solaris (i.e., screen's terminal description, appar-
+            ently based on the X/Open documentation around 1995).  On the other
+-           hand, the terminal description gs6300 (AT&T PC6300 with EMOTS  Ter-
++           hand,  the terminal description gs6300 (AT&T PC6300 with EMOTS Ter-
+            minal Emulator) uses lowercase-i.
+ 
+-       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
+-       ACS_NEQUAL, ACS_STERLING) were not documented in any publicly  released
+-       System  V.   However,  many  publicly  available terminfos include acsc
+-       strings in which their key characters (pryz{|})  are  embedded,  and  a
+-       second-hand  list  of  their  character descriptions has come to light.
++       Some ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL,  ACS_PI,
++       ACS_NEQUAL,  ACS_STERLING) were not documented in any publicly released
++       System V.  However, many  publicly  available  terminfos  include  acsc
++       strings  in  which  their  key characters (pryz{|}) are embedded, and a
++       second-hand list of their character descriptions  has  come  to  light.
+        The ACS-prefixed names for them were invented for ncurses(3x).
+ 
+        The displayed values for the ACS_ and WACS_ constants depend on
+ 
+        o   the library configuration, i.e., ncurses versus ncursesw, where the
+-           latter  is  capable  of displaying Unicode while the former is not,
++           latter is capable of displaying Unicode while the  former  is  not,
+            and
+ 
+        o   whether the locale uses UTF-8 encoding.
+ 
+-       In certain cases, the terminal is unable to display line-drawing  char-
++       In  certain cases, the terminal is unable to display line-drawing char-
+        acters except by using UTF-8 (see the discussion of NCURSES_NO_UTF8_ACS
+        in ncurses(3x)).
+ 
+ 
+

    Character Set

    +-       X/Open Curses assumes that the parameter passed to  waddch  contains  a
+-       single  character.   As  discussed in curs_attr(3x), that character may
+-       have been more than eight bits in an SVr3 or SVr4  implementation,  but
+-       in  the  X/Open Curses model, the details are not given.  The important
++       X/Open  Curses  assumes  that the parameter passed to waddch contains a
++       single character.  As discussed in curs_attr(3x),  that  character  may
++       have  been  more than eight bits in an SVr3 or SVr4 implementation, but
++       in the X/Open Curses model, the details are not given.   The  important
+        distinction between SVr4 curses and X/Open Curses is that the non-char-
+        acter information (attributes and color) was separated from the charac-
+        ter information which is packed in a chtype to pass to waddch.
+ 
+-       In this implementation,  chtype  holds  an  eight-bit  character.   But
+-       ncurses  allows  multibyte  characters  to be passed in a succession of
+-       calls to waddch.  The other implementations do not do this; a  call  to
+-       waddch  passes  exactly  one  character which may be rendered as one or
++       In  this  implementation,  chtype  holds  an  eight-bit character.  But
++       ncurses allows multibyte characters to be passed  in  a  succession  of
++       calls  to  waddch.  The other implementations do not do this; a call to
++       waddch passes exactly one character which may be  rendered  as  one  or
+        more cells on the screen depending on whether it is printable.
+ 
+-       Depending on the locale settings, ncurses will inspect the byte  passed
+-       in  each  call  to waddch, and check if the latest call will continue a
++       Depending  on the locale settings, ncurses will inspect the byte passed
++       in each call to waddch, and check if the latest call  will  continue  a
+        multibyte sequence.  When a character is complete, ncurses displays the
+        character and moves to the next position in the screen.
+ 
+-       If  the  calling  application  interrupts  the succession of bytes in a
++       If the calling application interrupts the  succession  of  bytes  in  a
+        multibyte character by moving the current location (e.g., using wmove),
+        ncurses discards the partially built character, starting over again.
+ 
+-       For  portability to other implementations, do not rely upon this behav-
++       For portability to other implementations, do not rely upon this  behav-
+        ior:
+ 
+-       o   check if a character can be represented as a  single  byte  in  the
++       o   check  if  a  character  can be represented as a single byte in the
+            current locale before attempting call waddch, and
+ 
+        o   call wadd_wch for characters which cannot be handled by waddch.
+ 
+ 
+

    TABSIZE

    +-       The  TABSIZE  variable  is  implemented  in  SVr4 and other versions of
+-       curses, but is not part of X/Open curses  (see  curs_variables(3x)  for
++       The TABSIZE variable is implemented  in  SVr4  and  other  versions  of
++       curses,  but  is  not part of X/Open curses (see curs_variables(3x) for
+        more details).
+ 
+        If ch is a carriage return, the cursor is moved to the beginning of the
+-       current row of the window.  This is true of other implementations,  but
++       current  row of the window.  This is true of other implementations, but
+        is not documented.
+ 
+ 
+@@ -280,7 +291,7 @@
+        curses(3x),  curs_attr(3x),  curs_clear(3x),  curs_inch(3x),  curs_out-
+        opts(3x), curs_refresh(3x), curs_variables(3x), putc(3).
+ 
+-       Comparable functions  in  the  wide-character  (ncursesw)  library  are
++       Comparable  functions  in  the  wide-character  (ncursesw)  library are
+        described in curs_add_wch(3x).
+ 
+ 
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.2-20200314+/doc/html/man/curs_addstr.3x.html	2020-02-03 01:26:24.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/curs_addstr.3x.html	2020-03-22 00:35:00.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addstr.3x,v 1.20 2020/02/02 23:34:34 tom Exp @
++  * @Id: curs_addstr.3x,v 1.22 2020/03/22 00:06:42 tom Exp @
+ -->
+ 
+ 
+@@ -67,16 +67,16 @@
+ 
+

    DESCRIPTION

    +        These functions write the (null-terminated) character string str on the
+-       given window.  It is similar to calling waddch once for each  character
+-       in the string.
++       given window.  It is similar to calling waddch once for  each  byte  in
++       the string.
+ 
+        The mv functions perform cursor movement once, before writing any char-
+        acters.  Thereafter, the cursor is advanced as a side-effect of writing
+        to the window.
+ 
+-       The  four functions with n as the last argument write at most n charac-
+-       ters, or until a terminating null is reached.  If n is -1, then the en-
+-       tire string will be added.
++       The  four  functions with n as the last argument write at most n bytes,
++       or until a terminating null is reached.  If n is -1,  then  the  entire
++       string will be added.
+ 
+ 
+

    RETURN VALUE

    +@@ -93,7 +93,15 @@
+ 
+        Functions with a "mv" prefix first  perform  a  cursor  movement  using
+        wmove, and return an error if the position is outside the window, or if
+-       the window pointer is null.
++       the window pointer is null.  If an error is returned by the  wmove,  no
++       characters are added to the window.
++
++       If  an  error  is  returned  by waddch (e.g., because the window is not
++       large enough, or an illegal byte sequence was detected)  only  part  of
++       the  string  may be added.  Aside from that, there is a special case in
++       waddch where an error may be  returned  after  successfully  writing  a
++       character  to  the lower-right corner of a window when scrollok is dis-
++       abled.
+ 
+ 
+

    NOTES

    +Index: doc/html/man/form.3x.html
+--- ncurses-6.2-20200314+/doc/html/man/form.3x.html	2020-03-15 00:28:10.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/form.3x.html	2020-03-22 00:35:02.000000000 +0000
+@@ -247,7 +247,7 @@
+        curses(3x)  and  related  pages  whose names begin "form_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.2-20200314+/doc/html/man/infocmp.1m.html	2020-03-15 00:28:11.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/infocmp.1m.html	2020-03-22 00:35:03.000000000 +0000
+@@ -513,7 +513,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.2-20200314+/doc/html/man/infotocap.1m.html	2020-03-15 00:28:11.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/infotocap.1m.html	2020-03-22 00:35:03.000000000 +0000
+@@ -91,7 +91,7 @@
+

    SEE ALSO

    +        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.2-20200314+/doc/html/man/menu.3x.html	2020-03-15 00:28:11.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/menu.3x.html	2020-03-22 00:35:03.000000000 +0000
+@@ -222,7 +222,7 @@
+        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.2-20200314+/doc/html/man/ncurses.3x.html	2020-03-15 00:28:12.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/ncurses.3x.html	2020-03-22 00:35:04.000000000 +0000
+@@ -28,7 +28,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.146 2020/03/14 23:13:18 tom Exp @
++  * @Id: ncurses.3x,v 1.147 2020/03/21 23:38:25 tom Exp @
+ -->
+ 
+ 
+@@ -60,7 +60,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+@@ -757,6 +757,12 @@
+        (i.e., these should not be used as the right-hand  side  of  assignment
+        statements).
+ 
++       Functions  with  a  "mv"  prefix  first perform a cursor movement using
++       wmove, and return an error if the position is outside the window, or if
++       the window pointer is null.  Most "mv"-prefixed functions (except vari-
++       adic functions such as mvprintw) are provided both as macros and  func-
++       tions.
++
+        Routines that return pointers return NULL on error.
+ 
+ 
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.2-20200314+/doc/html/man/ncurses6-config.1.html	2020-03-15 00:28:12.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/ncurses6-config.1.html	2020-03-22 00:35:04.000000000 +0000
+@@ -113,7 +113,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.2-20200314+/doc/html/man/panel.3x.html	2020-03-15 00:28:12.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/panel.3x.html	2020-03-22 00:35:04.000000000 +0000
+@@ -281,7 +281,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.2-20200314+/doc/html/man/tabs.1.html	2020-03-15 00:28:12.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/tabs.1.html	2020-03-22 00:35:04.000000000 +0000
+@@ -206,7 +206,7 @@
+

    SEE ALSO

    +        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.2-20200314+/doc/html/man/terminfo.5.html	2020-03-15 00:28:12.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/terminfo.5.html	2020-03-22 00:35:04.000000000 +0000
+@@ -105,7 +105,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This manual describes ncurses version 6.2 (patch 20200314).
++       This manual describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+

    Terminfo Entry Syntax

    +Index: doc/html/man/tic.1m.html
+--- ncurses-6.2-20200314+/doc/html/man/tic.1m.html	2020-03-15 00:28:12.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/tic.1m.html	2020-03-22 00:35:04.000000000 +0000
+@@ -461,7 +461,7 @@
+        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.2-20200314+/doc/html/man/toe.1m.html	2020-03-15 00:28:12.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/toe.1m.html	2020-03-22 00:35:04.000000000 +0000
+@@ -171,7 +171,7 @@
+        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
+        minfo(5).
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.2-20200314+/doc/html/man/tput.1.html	2020-03-15 00:28:12.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/tput.1.html	2020-03-22 00:35:04.000000000 +0000
+@@ -523,7 +523,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.2-20200314+/doc/html/man/tset.1.html	2020-03-15 00:28:12.000000000 +0000
++++ ncurses-6.2-20200321/doc/html/man/tset.1.html	2020-03-22 00:35:04.000000000 +0000
+@@ -390,7 +390,7 @@
+        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.2 (patch 20200314).
++       This describes ncurses version 6.2 (patch 20200321).
+ 
+ 
+ 
+Index: man/curs_add_wch.3x
+Prereq:  1.26 
+--- ncurses-6.2-20200314+/man/curs_add_wch.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200321/man/curs_add_wch.3x	2020-03-22 00:25:15.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.26 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_add_wch.3x,v 1.27 2020/03/22 00:25:15 tom Exp $
+ .TH curs_add_wch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -212,6 +212,25 @@
+ .PP
+ All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success.
+ .PP
++X/Open does not define any error conditions.
++This implementation returns an error
++.bP
++if the window pointer is null or
++.bP
++if it is not possible to add a complete character in the window.
++.PP
++The latter may be due to different causes:
++.bP
++If \fBscrollok\fR is not enabled,
++writing a character at the lower right margin succeeds.
++However, an error is returned because
++it is not possible to wrap to a new line
++.bP
++If an error is detected when converting a multibyte character to a sequence
++of bytes,
++or if it is not possible to add all of the resulting bytes in the window,
++an error is returned.
++.PP
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+Index: man/curs_addch.3x
+Prereq:  1.51 
+--- ncurses-6.2-20200314+/man/curs_addch.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200321/man/curs_addch.3x	2020-03-21 23:47:23.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.51 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_addch.3x,v 1.52 2020/03/21 23:47:23 tom Exp $
+ .TH curs_addch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -175,6 +175,19 @@
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
++.PP
++If it is not possible to add a complete character,
++an error is returned:
++.bP
++If \fBscrollok\fR is not enabled,
++writing a character at the lower right margin succeeds.
++However, an error is returned because
++it is not possible to wrap to a new line
++.bP
++If an error is detected when converting a multibyte character to a sequence
++of bytes,
++or if it is not possible to add all of the resulting bytes in the window,
++an error is returned.
+ .SH NOTES
+ Note that \fBaddch\fR, \fBmvaddch\fR, \fBmvwaddch\fR, and
+ \fBechochar\fR may be macros.
+Index: man/curs_addstr.3x
+Prereq:  1.20 
+--- ncurses-6.2-20200314+/man/curs_addstr.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200321/man/curs_addstr.3x	2020-03-22 00:06:42.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.20 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_addstr.3x,v 1.22 2020/03/22 00:06:42 tom Exp $
+ .TH curs_addstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -73,14 +73,14 @@
+ .SH DESCRIPTION
+ These functions write the (null-terminated) character string
+ \fIstr\fR on the given window.
+-It is similar to calling \fBwaddch\fR once for each character in the string.
++It is similar to calling \fBwaddch\fR once for each byte in the string.
+ .PP
+ The \fImv\fR functions perform cursor movement once, before writing any
+ characters.
+ Thereafter, the cursor is advanced as a side-effect of writing to the window.
+ .PP
+ The four functions with \fIn\fR as the last argument
+-write at most \fIn\fR characters,
++write at most \fIn\fR bytes,
+ or until a terminating null is reached.
+ If \fIn\fR is \-1, then the entire string will be added.
+ .SH RETURN VALUE
+@@ -98,6 +98,18 @@
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
++If an error is returned by the \fBwmove\fP,
++no characters are added to the window.
++.PP
++If an error is returned by \fBwaddch\fP
++(e.g.,
++because the window is not large enough,
++or an illegal byte sequence was detected)
++only part of the string may be added.
++Aside from that,
++there is a special case in \fBwaddch\fP where an error may be
++returned after successfully writing a character to the lower-right corner
++of a window when \fBscrollok\fP is disabled.
+ .SH NOTES
+ All of these functions except \fBwaddnstr\fR may be macros.
+ .SH PORTABILITY
+Index: man/ncurses.3x
+Prereq:  1.146 
+--- ncurses-6.2-20200314+/man/ncurses.3x	2020-03-14 23:13:18.000000000 +0000
++++ ncurses-6.2-20200321/man/ncurses.3x	2020-03-21 23:38:25.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.146 2020/03/14 23:13:18 tom Exp $
++.\" $Id: ncurses.3x,v 1.147 2020/03/21 23:38:25 tom Exp $
+ .hy 0
+ .TH ncurses 3X ""
+ .ie \n(.g .ds `` \(lq
+@@ -799,6 +799,13 @@
+ \fBgetmaxyx\fR are undefined (i.e., these should not be used as the
+ right-hand side of assignment statements).
+ .PP
++Functions with a \*(``mv\*('' prefix first perform a cursor movement using
++\fBwmove\fP, and return an error if the position is outside the window,
++or if the window pointer is null.
++Most \*(``mv\*(''-prefixed functions
++(except variadic functions such as \fBmvprintw\fP)
++are provided both as macros and functions.
++.PP
+ Routines that return pointers return \fBNULL\fR on error.
+ .SH ENVIRONMENT
+ .PP
+Index: package/debian-mingw/changelog
+--- ncurses-6.2-20200314+/package/debian-mingw/changelog	2020-03-14 15:30:00.000000000 +0000
++++ ncurses-6.2-20200321/package/debian-mingw/changelog	2020-03-21 12:15:18.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200314) unstable; urgency=low
++ncurses6 (6.2+20200321) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 14 Mar 2020 11:30:00 -0400
++ -- Thomas E. Dickey   Sat, 21 Mar 2020 08:15:18 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.2-20200314+/package/debian-mingw64/changelog	2020-03-14 15:30:00.000000000 +0000
++++ ncurses-6.2-20200321/package/debian-mingw64/changelog	2020-03-21 12:15:18.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200314) unstable; urgency=low
++ncurses6 (6.2+20200321) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 14 Mar 2020 11:30:00 -0400
++ -- Thomas E. Dickey   Sat, 21 Mar 2020 08:15:18 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.2-20200314+/package/debian/changelog	2020-03-14 15:30:00.000000000 +0000
++++ ncurses-6.2-20200321/package/debian/changelog	2020-03-21 12:15:18.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200314) unstable; urgency=low
++ncurses6 (6.2+20200321) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 14 Mar 2020 11:30:00 -0400
++ -- Thomas E. Dickey   Sat, 21 Mar 2020 08:15:18 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.385 
+--- ncurses-6.2-20200314+/package/mingw-ncurses.nsi	2020-03-14 15:30:00.000000000 +0000
++++ ncurses-6.2-20200321/package/mingw-ncurses.nsi	2020-03-21 12:15:18.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.385 2020/03/14 15:30:00 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.386 2020/03/21 12:15:18 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "2"
+ !define VERSION_YYYY  "2020"
+-!define VERSION_MMDD  "0314"
++!define VERSION_MMDD  "0321"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.2-20200314+/package/mingw-ncurses.spec	2020-03-14 15:30:00.000000000 +0000
++++ ncurses-6.2-20200321/package/mingw-ncurses.spec	2020-03-21 12:15:18.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.2
+-Release: 20200314
++Release: 20200321
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.2-20200314+/package/ncurses.spec	2020-03-14 15:30:00.000000000 +0000
++++ ncurses-6.2-20200321/package/ncurses.spec	2020-03-21 12:15:18.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.2
+-Release: 20200314
++Release: 20200321
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.2-20200314+/package/ncursest.spec	2020-03-14 15:30:00.000000000 +0000
++++ ncurses-6.2-20200321/package/ncursest.spec	2020-03-21 12:15:18.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.2
+-Release: 20200314
++Release: 20200321
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/Makefile.in
+Prereq:  1.123 
+--- ncurses-6.2-20200314+/test/Makefile.in	2020-03-08 16:15:42.000000000 +0000
++++ ncurses-6.2-20200321/test/Makefile.in	2020-03-21 16:09:06.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.123 2020/03/08 16:15:42 tom Exp $
++# $Id: Makefile.in,v 1.124 2020/03/21 16:09:06 tom Exp $
+ ##############################################################################
+ # Copyright 2020 Thomas E. Dickey                                            #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
+@@ -138,15 +138,16 @@
+ LINT_LIBS	= -lform -lmenu -lpanel -lncurses @LIBS@
+ 
+ INCDIR		= $(top_srcdir)/include
++incdir		= ../include
+ 
+ HEADER_DEPS	= \
+-	../include/curses.h \
+-	../include/term.h \
+-	../include/ncurses_cfg.h \
+-	../include/ncurses_def.h \
+-	../include/ncurses_dll.h \
+-	../include/term.h \
+-	../include/unctrl.h \
++	$(incdir)/curses.h \
++	$(incdir)/term.h \
++	$(incdir)/ncurses_cfg.h \
++	$(incdir)/ncurses_def.h \
++	$(incdir)/ncurses_dll.h \
++	$(incdir)/term.h \
++	$(incdir)/unctrl.h \
+ 	$(INCDIR)/nc_alloc.h
+ 
+ # The rest is generated from the "programs" and "modules" files...
+Index: test/README
+Prereq:  1.69 
+--- ncurses-6.2-20200314+/test/README	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200321/test/README	2020-03-21 22:25:28.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: README,v 1.69 2020/02/02 23:34:34 tom Exp $
++-- $Id: README,v 1.70 2020/03/21 22:25:28 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ The programs in this directory are used to test and demonstrate ncurses.
+@@ -74,17 +74,16 @@
+ These programs provide examples of use, but do not comprise a complete set of
+ tests.  Here is a list of library externals, noting those that are used:
+ 
+-
+ libform:
+ -------
+ TYPE_ALNUM			test: demo_forms
+-TYPE_ALPHA			test: demo_forms ncurses
++TYPE_ALPHA			test: demo_forms dup_field move_field ncurses
+ TYPE_ENUM			test: demo_forms
+ TYPE_INTEGER			test: demo_forms
+ TYPE_IPV4			test: demo_forms
+ TYPE_NUMERIC			test: demo_forms
+ TYPE_REGEXP			test: demo_forms
+-current_field			test: demo_forms edit_field ncurses
++current_field			test: demo_forms dup_field edit_field move_field ncurses
+ data_ahead			test: demo_forms
+ data_behind			test: demo_forms
+ dup_field			-
+@@ -92,63 +91,63 @@
+ field_arg			test: demo_forms
+ field_back			test: demo_forms edit_field
+ field_buffer			test: cardfile demo_forms ncurses
+-field_count			test: demo_forms
++field_count			test: demo_forms move_field
+ field_fore			test: demo_forms
+ field_index			test: demo_forms
+ field_info			test: edit_field ncurses
+ field_init			-
+ field_just			-
+-field_opts			test: demo_forms ncurses
++field_opts			test: demo_forms dup_field move_field ncurses
+ field_opts_off			test: cardfile demo_forms form_driver_w
+ field_opts_on			test: demo_forms
+ field_pad			test: demo_forms
+ field_status			test: demo_forms
+ field_term			-
+ field_type			test: demo_forms
+-field_userptr			test: edit_field ncurses
+-form_driver			test: cardfile demo_forms edit_field ncurses
++field_userptr			test: dup_field edit_field move_field ncurses
++form_driver			test: cardfile demo_forms dup_field edit_field move_field ncurses
+ form_driver_w			test: form_driver_w
+-form_fields			test: cardfile demo_forms
++form_fields			test: cardfile demo_forms move_field
+ form_init			-
+ form_opts			-
+ form_opts_off			-
+ form_opts_on			-
+ form_page			test: demo_forms
+ form_request_by_name		-
+-form_request_name		test: edit_field
+-form_sub			test: cardfile demo_forms ncurses
++form_request_name		test: dup_field edit_field move_field
++form_sub			test: cardfile demo_forms dup_field move_field ncurses
+ form_term			-
+ form_userptr			-
+-form_win			test: cardfile demo_forms edit_field form_driver_w ncurses
+-free_field			test: cardfile demo_forms form_driver_w ncurses
++form_win			test: cardfile demo_forms dup_field edit_field form_driver_w move_field ncurses
++free_field			test: cardfile demo_forms dup_field form_driver_w move_field ncurses
+ free_fieldtype			test: ncurses
+-free_form			test: cardfile demo_forms form_driver_w ncurses
++free_form			test: cardfile demo_forms dup_field form_driver_w move_field ncurses
+ link_field			-
+ link_fieldtype			-
+-move_field			-
+-new_field			test: cardfile demo_forms form_driver_w ncurses
++move_field			test: move_field
++new_field			test: cardfile demo_forms dup_field form_driver_w move_field ncurses
+ new_fieldtype			test: ncurses
+-new_form			test: cardfile demo_forms form_driver_w ncurses
++new_form			test: cardfile demo_forms dup_field form_driver_w move_field ncurses
+ new_form_sp			-
+ new_page			test: demo_forms
+ pos_form_cursor			-
+-post_form			test: cardfile demo_forms form_driver_w ncurses
++post_form			test: cardfile demo_forms dup_field form_driver_w move_field ncurses
+ scale_form			test: demo_forms ncurses
+ set_current_field		test: demo_forms
+-set_field_back			test: cardfile demo_forms edit_field form_driver_w ncurses
+-set_field_buffer		test: cardfile demo_forms edit_field ncurses
++set_field_back			test: cardfile demo_forms dup_field edit_field form_driver_w move_field ncurses
++set_field_buffer		test: cardfile demo_forms dup_field edit_field move_field ncurses
+ set_field_fore			test: demo_forms
+ set_field_init			-
+ set_field_just			test: cardfile demo_forms
+-set_field_opts			test: demo_forms ncurses
++set_field_opts			test: demo_forms dup_field move_field ncurses
+ set_field_pad			test: demo_forms
+ set_field_status		test: demo_forms
+ set_field_term			-
+-set_field_type			test: demo_forms ncurses
++set_field_type			test: demo_forms dup_field move_field ncurses
+ set_field_userptr		test: edit_field ncurses
+ set_fieldtype_arg		-
+ set_fieldtype_choice		-
+-set_form_fields			-
++set_form_fields			test: move_field
+ set_form_init			-
+ set_form_opts			-
+ set_form_page			-
+@@ -159,7 +158,7 @@
+ set_max_field			test: demo_forms
+ set_new_page			test: demo_forms
+ unfocus_current_field		-
+-unpost_form			test: cardfile demo_forms form_driver_w ncurses
++unpost_form			test: cardfile demo_forms dup_field form_driver_w move_field ncurses
+ 
+ libmenu:
+ -------
+@@ -233,11 +232,11 @@
+ ----------
+ BC				test: demo_termcap
+ COLORS				test: color_content demo_new_pair dots_curses dots_xcurses echochar ncurses pair_content picsmap savescreen xmas
+-COLOR_PAIR			test: background blue bs cardfile clip_printw demo_forms demo_menus demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
++COLOR_PAIR			test: background blue bs cardfile clip_printw demo_forms demo_menus demo_panels dots_curses dup_field echochar filter firework gdc hanoi ins_wide insdelln inserts knight move_field ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
+ COLOR_PAIRS			test: demo_new_pair dots_curses dots_xcurses echochar ncurses newdemo pair_content
+-COLS				test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_curses dots_xcurses echochar filter firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm
++COLS				test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs ditto dots_curses dots_xcurses echochar filter firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm
+ ESCDELAY			test: test_opaque
+-LINES				test: cardfile demo_defkey demo_keyok demo_menus demo_panels ditto dots_curses dots_xcurses echochar firework hanoi hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
++LINES				test: cardfile demo_defkey demo_keyok demo_menus demo_panels demo_tabs ditto dots_curses dots_xcurses echochar firework hanoi hashtest inch_wide inchs ins_wide inserts lrtest move_field movewindow ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+ PAIR_NUMBER			test: dump_window ncurses
+ PC				test: demo_termcap
+ SP				lib: form
+@@ -247,7 +246,7 @@
+ add_wch				test: demo_new_pair demo_panels ncurses picsmap savescreen test_add_wchstr test_addwstr
+ add_wchnstr			test: test_add_wchstr
+ add_wchstr			test: test_add_wchstr view
+-addch				test: background blue bs color_content dots_curses echochar hashtest ncurses padview pair_content picsmap savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_opaque testaddch view worm
++addch				test: background blue bs color_content demo_tabs dots_curses echochar hashtest ncurses padview pair_content picsmap savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_opaque testaddch view worm
+ addchnstr			test: test_addchstr
+ addchstr			test: test_addchstr
+ addnstr				test: test_addstr
+@@ -267,9 +266,9 @@
+ attrset				test: bs filter firework gdc hanoi insdelln ncurses picsmap rain tclock testaddch testcurs
+ baudrate			test: ncurses
+ baudrate_sp			test: sp_tinfo
+-beep				test: blue bs cardfile chgat clip_printw demo_forms demo_menus demo_new_pair demo_panels edit_field firstlast hanoi inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses padview popup_msg rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr 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_new_pair demo_panels dup_field edit_field firstlast hanoi inch_wide inchs ins_wide insdelln inserts knight move_field movewindow ncurses padview popup_msg rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
+ beep_sp				lib: ncurses
+-bkgd				test: background cardfile demo_forms ncurses padview savescreen tclock view
++bkgd				test: background cardfile demo_forms dup_field move_field ncurses padview savescreen tclock view
+ bkgdset				test: background ncurses testaddch
+ bkgrnd				test: ncurses
+ bkgrndset			test: ncurses
+@@ -282,12 +281,12 @@
+ box_set				test: ncurses
+ can_change_color		test: color_content extended_color ncurses
+ can_change_color_sp		test: extended_color
+-cbreak				test: background blue bs cardfile chgat clip_printw color_content color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto extended_color filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo padview pair_content picsmap savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr 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_content color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dup_field extended_color filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+ cbreak_sp			test: sp_tinfo
+ chgat				test: chgat
+ clear				test: blue bs filter gdc ncurses padview testcurs xmas
+ clearok				test: bs knight
+-clrtobot			test: demo_menus ncurses view
++clrtobot			test: demo_menus move_field ncurses view
+ clrtoeol			test: blue bs demo_altkeys filter foldkeys form_driver_w hanoi hashtest movewindow ncurses padview view
+ color_content			test: color_content ncurses picsmap
+ color_content_sp		-
+@@ -297,6 +296,7 @@
+ curs_set			test: demo_new_pair echochar firework gdc hanoi lrtest ncurses newdemo picsmap rain savescreen tclock testcurs worm xmas
+ curs_set_sp			test: sp_tinfo
+ curscr				test: demo_panels knight lrtest ncurses popup_msg savescreen tclock
++curses_trace			test: demo_menus hashtest lrtest ncurses padview redraw test_sgr test_termattrs test_vid_puts test_vidputs testcurs view worm
+ curses_version			test: ncurses progs: clear infocmp tabs tic toe tput tset
+ def_prog_mode			test: bs ncurses
+ def_prog_mode_sp		test: sp_tinfo
+@@ -311,7 +311,7 @@
+ delch				-
+ deleteln			test: insdelln
+ delscreen			test: ditto dots_mvcur
+-delwin				test: cardfile chgat clip_printw demo_forms demo_panels inch_wide inchs ins_wide insdelln inserts ncurses newdemo popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view
++delwin				test: cardfile chgat clip_printw demo_forms demo_panels dup_field inch_wide inchs ins_wide insdelln inserts move_field ncurses newdemo popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view
+ derwin				test: cardfile chgat clip_printw demo_forms demo_menus ditto inch_wide inchs ins_wide insdelln inserts movewindow ncurses test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque
+ doupdate			test: cardfile demo_menus demo_panels ditto ins_wide inserts knight movewindow ncurses padview popup_msg redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr
+ doupdate_sp			lib: ncurses
+@@ -320,12 +320,14 @@
+ echo_sp				lib: ncurses
+ echo_wchar			test: ncurses
+ echochar			test: echochar ncurses
+-endwin				test: background blue bs cardfile chgat clip_printw color_content color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto dots_curses dots_mvcur dots_xcurses echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr 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_content color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_mvcur dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
+ endwin_sp			lib: ncurses
+ erase				test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses picsmap tclock test_opaque testcurs
+ erasechar			test: ncurses
+ erasechar_sp			test: sp_tinfo
+ erasewchar			test: ncurses
++exit_curses			-
++exit_terminfo			lib: ncurses
+ extended_color_content		test: color_content extended_color
+ extended_color_content_sp	test: extended_color
+ extended_pair_content		test: extended_color pair_content
+@@ -347,14 +349,14 @@
+ get_wch				test: form_driver_w
+ get_wstr			test: test_get_wstr
+ getattrs			-
+-getbegx				test: chgat clip_printw demo_menus demo_panels dump_window insdelln movewindow ncurses newdemo redraw testcurs
+-getbegy				test: chgat clip_printw demo_menus demo_panels dump_window insdelln movewindow ncurses newdemo redraw testcurs
++getbegx				test: chgat clip_printw demo_menus demo_panels dump_window insdelln move_field movewindow ncurses newdemo redraw testcurs
++getbegy				test: chgat clip_printw demo_menus demo_panels dump_window insdelln move_field movewindow ncurses newdemo redraw testcurs
+ getbkgd				test: ncurses
+ getbkgrnd			test: ncurses
+ getcchar			test: ncurses savescreen view
+-getch				test: background blue bs chgat color_content color_set demo_altkeys demo_new_pair extended_color filter firework firstlast foldkeys hanoi hashtest insdelln lrtest padview pair_content picsmap savescreen tclock test_opaque testaddch testcurs view xmas
+-getcurx				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs view
+-getcury				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln movewindow ncurses popup_msg redraw savescreen test_opaque testcurs view
++getch				test: background blue bs chgat color_content color_set demo_altkeys demo_new_pair demo_tabs extended_color filter firework firstlast foldkeys hanoi hashtest insdelln lrtest padview pair_content picsmap savescreen tclock test_opaque testaddch testcurs view xmas
++getcurx				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln move_field movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs view
++getcury				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln move_field movewindow ncurses popup_msg redraw savescreen test_opaque testcurs view
+ getmaxx				test: chgat clip_printw demo_panels dump_window firstlast inch_wide inchs insdelln movewindow ncurses newdemo popup_msg redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+ getmaxy				test: chgat clip_printw demo_forms demo_panels dump_window firstlast inch_wide inchs insdelln movewindow ncurses newdemo popup_msg redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+ getmouse			test: bs demo_menus knight movewindow ncurses testcurs
+@@ -368,7 +370,7 @@
+ getwin_sp			-
+ halfdelay			test: padview view
+ halfdelay_sp			test: sp_tinfo
+-has_colors			test: background bs cardfile chgat clip_printw color_content color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses dots_xcurses echochar extended_color filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs view worm xmas
++has_colors			test: background bs cardfile chgat clip_printw color_content color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses dots_xcurses dup_field echochar extended_color filter firework gdc hanoi ins_wide insdelln inserts knight move_field ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs view worm xmas
+ has_colors_sp			lib: ncurses
+ has_ic				test: lrtest ncurses
+ has_ic_sp			test: sp_tinfo
+@@ -395,9 +397,9 @@
+ init_extended_color_sp		test: extended_color
+ init_extended_pair		test: extended_color ncurses pair_content picsmap
+ init_extended_pair_sp		test: extended_color
+-init_pair			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses dots_xcurses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
++init_pair			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses dots_xcurses dup_field echochar filter firework gdc hanoi ins_wide insdelln inserts knight move_field ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
+ init_pair_sp			-
+-initscr				test: background blue bs cardfile chgat clip_printw color_content color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels dots_curses dots_xcurses echochar filter firework firstlast form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
++initscr				test: background blue bs cardfile chgat clip_printw color_content color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_xcurses dup_field echochar filter firework firstlast form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr 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
+@@ -409,7 +411,7 @@
+ insnstr				test: inserts
+ insstr				test: inserts
+ instr				test: test_instr
+-intrflush			test: demo_forms movewindow
++intrflush			test: demo_forms dup_field move_field movewindow
+ intrflush_sp			test: sp_tinfo
+ inwstr				test: test_inwstr
+ is_cleared			test: test_opaque
+@@ -435,11 +437,11 @@
+ key_name			test: key_names ncurses
+ keybound			test: demo_altkeys demo_defkey
+ keybound_sp			test: sp_tinfo
+-keyname				test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldkeys keynames movewindow ncurses padview redraw test_getstr testcurs view progs: tic
++keyname				test: demo_altkeys demo_defkey demo_keyok demo_menus dup_field edit_field foldkeys keynames move_field movewindow ncurses padview redraw test_getstr testcurs view progs: tic
+ keyname_sp			test: sp_tinfo
+ keyok				test: demo_keyok foldkeys
+ keyok_sp			test: sp_tinfo
+-keypad				test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto filter firework foldkeys form_driver_w hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses padview popup_msg redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr 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_new_pair demo_panels ditto dup_field filter firework foldkeys form_driver_w hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses padview popup_msg redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
+ killchar			test: ncurses
+ killchar_sp			test: sp_tinfo
+ killwchar			test: ncurses
+@@ -454,7 +456,7 @@
+ mouseinterval_sp		-
+ mousemask			test: bs demo_forms demo_menus knight movewindow ncurses testcurs
+ mousemask_sp			-
+-move				test: blue bs cardfile chgat demo_altkeys demo_menus demo_new_pair dots_curses dots_xcurses echochar filter foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses picsmap savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testscanw view xmas
++move				test: blue bs cardfile chgat demo_altkeys demo_menus demo_new_pair demo_tabs dots_curses dots_xcurses echochar filter foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest move_field movewindow ncurses picsmap savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testscanw view xmas
+ mvadd_wch			test: ncurses test_add_wchstr test_addwstr
+ mvadd_wchnstr			test: test_add_wchstr
+ mvadd_wchstr			test: test_add_wchstr
+@@ -494,7 +496,7 @@
+ mvinsstr			test: inserts
+ mvinstr				test: test_instr
+ mvinwstr			test: test_inwstr
+-mvprintw			test: background bs firework form_driver_w hanoi ncurses padview savescreen tclock view
++mvprintw			test: background bs firework form_driver_w hanoi move_field ncurses padview savescreen tclock view
+ mvscanw				-
+ mvvline				test: ncurses
+ mvvline_set			test: ncurses
+@@ -549,20 +551,20 @@
+ newterm_sp			-
+ newwin				test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
+ newwin_sp			lib: ncurses
+-nl				test: demo_forms ncurses rain testcurs
++nl				test: demo_forms dup_field move_field ncurses rain testcurs
+ nl_sp				lib: ncurses
+ nocbreak			test: testcurs
+ nocbreak_sp			test: sp_tinfo
+ nodelay				test: demo_new_pair ditto extended_color firework gdc lrtest ncurses newdemo padview rain tclock test_opaque view worm xmas
+-noecho				test: background bs cardfile chgat clip_printw color_content color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto extended_color firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
++noecho				test: background bs cardfile chgat clip_printw color_content color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dup_field extended_color firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+ noecho_sp			lib: ncurses
+ nofilter			-
+ nofilter_sp			-
+-nonl				test: bs demo_forms hashtest movewindow ncurses padview view worm xmas
++nonl				test: bs demo_forms dup_field hashtest move_field movewindow ncurses padview view worm xmas
+ nonl_sp				lib: ncurses
+ noqiflush			-
+ noqiflush_sp			test: sp_tinfo
+-noraw				test: demo_forms demo_menus ncurses testcurs
++noraw				test: demo_forms demo_menus dup_field move_field ncurses testcurs
+ noraw_sp			test: sp_tinfo
+ notimeout			test: ncurses test_opaque
+ numcodes			test: demo_termcap test_arrays progs: dump_entry
+@@ -577,16 +579,16 @@
+ pechochar			-
+ pnoutrefresh			test: ncurses padview popup_msg
+ prefresh			test: testcurs
+-printw				test: background blue bs color_content color_set demo_altkeys demo_defkey demo_keyok extended_color filter foldkeys ncurses pair_content savescreen testcurs testscanw view
++printw				test: background blue bs color_content color_set demo_altkeys demo_defkey demo_keyok demo_tabs extended_color filter foldkeys ncurses pair_content savescreen testcurs testscanw view
+ putp				test: filter test_sgr progs: tput
+ putp_sp				test: sp_tinfo
+ putwin				test: ncurses
+ qiflush				-
+ qiflush_sp			test: sp_tinfo
+-raw				test: demo_forms ncurses redraw testcurs
++raw				test: demo_forms dup_field move_field ncurses redraw testcurs
+ raw_sp				test: sp_tinfo
+ redrawwin			test: padview redraw view
+-refresh				test: blue bs color_content demo_defkey demo_forms demo_keyok demo_menus demo_panels dots_curses dots_mvcur dots_xcurses echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest movewindow ncurses pair_content picsmap savescreen tclock testcurs view xmas
++refresh				test: blue bs color_content demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_mvcur dots_xcurses dup_field echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest move_field movewindow ncurses pair_content picsmap savescreen tclock testcurs view xmas
+ reset_color_pairs		test: picsmap
+ reset_color_pairs_sp		-
+ reset_prog_mode			test: filter ncurses
+@@ -620,7 +622,7 @@
+ set_curterm_sp			test: sp_tinfo
+ set_escdelay			test: test_opaque
+ set_escdelay_sp			lib: ncurses
+-set_tabsize			test: test_opaque
++set_tabsize			test: demo_tabs test_opaque
+ set_tabsize_sp			test: sp_tinfo
+ set_term			lib: ncurses
+ setcchar			test: demo_new_pair demo_panels ins_wide ncurses picsmap savescreen test_add_wchstr test_addwstr
+@@ -659,9 +661,9 @@
+ slk_wset			test: ncurses
+ standend			test: blue gdc ncurses
+ standout			test: blue ncurses
+-start_color			test: background blue bs cardfile chgat clip_printw color_content color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses dots_xcurses echochar extended_color filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
++start_color			test: background blue bs cardfile chgat clip_printw color_content color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses dots_xcurses dup_field echochar extended_color filter firework gdc hanoi ins_wide insdelln inserts knight move_field ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
+ start_color_sp			-
+-stdscr				test: background bs chgat clip_printw color_content demo_altkeys demo_forms demo_menus demo_new_pair demo_panels ditto edit_field extended_color filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
++stdscr				test: background bs chgat clip_printw color_content demo_altkeys demo_forms demo_menus demo_new_pair demo_panels ditto dup_field edit_field extended_color filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
+ strcodes			test: demo_termcap test_arrays progs: dump_entry
+ strfnames			test: demo_terminfo list_keys test_arrays progs: dump_entry
+ strnames			test: demo_terminfo foldkeys list_keys test_arrays progs: dump_entry infocmp tic
+@@ -685,9 +687,9 @@
+ tgoto				test: dots_termcap railroad progs: tic
+ tigetflag			test: demo_terminfo savescreen progs: tic tput
+ tigetflag_sp			test: sp_tinfo
+-tigetnum			test: demo_terminfo dots dots_mvcur ncurses savescreen progs: tput
++tigetnum			test: demo_tabs demo_terminfo dots dots_mvcur ncurses savescreen progs: tput
+ tigetnum_sp			test: sp_tinfo
+-tigetstr			test: blue demo_defkey demo_new_pair demo_terminfo foldkeys list_keys savescreen test_sgr testcurs progs: clear_cmd tput
++tigetstr			test: blue demo_defkey demo_new_pair demo_terminfo foldkeys list_keys savescreen test_sgr testcurs progs: clear_cmd tic tput
+ tigetstr_sp			test: sp_tinfo
+ timeout				test: filter rain savescreen
+ tiparm				-
+@@ -696,7 +698,7 @@
+ tparm				test: dots dots_mvcur test_sgr progs: reset_cmd tabs tic tput
+ tputs				test: dots dots_mvcur dots_termcap railroad test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs
+ tputs_sp			test: sp_tinfo
+-trace				test: demo_menus hashtest lrtest ncurses padview redraw test_sgr test_termattrs test_vid_puts test_vidputs testcurs view worm
++trace				-
+ ttytype				test: demo_terminfo test_sgr
+ typeahead			test: testcurs
+ typeahead_sp			test: sp_tinfo
+@@ -768,11 +770,11 @@
+ wecho_wchar			lib: ncurses
+ wechochar			lib: ncurses
+ wenclose			test: ncurses
+-werase				test: cardfile demo_forms demo_menus demo_panels firstlast knight ncurses newdemo popup_msg test_get_wstr test_getstr test_opaque testcurs view xmas
++werase				test: cardfile demo_forms demo_menus demo_panels dup_field firstlast knight move_field ncurses newdemo popup_msg test_get_wstr test_getstr test_opaque testcurs view xmas
+ wget_wch			test: ins_wide ncurses test_add_wchstr test_addwstr
+ wget_wstr			test: test_get_wstr
+ wgetbkgrnd			lib: ncurses
+-wgetch				test: cardfile chgat clip_printw demo_defkey demo_keyok demo_menus demo_panels ditto dump_window edit_field gdc insdelln inserts knight movewindow ncurses newdemo popup_msg rain redraw test_addchstr test_addstr test_opaque testcurs worm
++wgetch				test: cardfile chgat clip_printw demo_defkey demo_keyok demo_menus demo_panels ditto dump_window dup_field edit_field gdc insdelln inserts knight move_field movewindow ncurses newdemo popup_msg rain redraw test_addchstr test_addstr test_opaque testcurs worm
+ wgetdelay			-
+ wgetn_wstr			test: ncurses test_get_wstr
+ wgetnstr			test: ncurses test_getstr
+@@ -804,7 +806,7 @@
+ wnoutrefresh			test: demo_menus ditto inch_wide inchs ins_wide inserts knight movewindow ncurses padview popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque
+ wprintw				test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels inch_wide inchs ins_wide insdelln inserts knight ncurses test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+ wredrawln			test: redraw
+-wrefresh			test: chgat clip_printw demo_forms demo_keyok demo_menus demo_panels firstlast ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo popup_msg redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs worm xmas
++wrefresh			test: chgat clip_printw demo_forms demo_keyok demo_menus demo_panels dup_field firstlast ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo popup_msg redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs worm xmas
+ wresize				test: cardfile demo_menus ncurses
+ wscanw				test: testcurs
+ wscrl				test: ncurses testcurs
+Index: test/aclocal.m4
+Prereq:  1.178 
+--- ncurses-6.2-20200314+/test/aclocal.m4	2020-03-08 14:13:15.000000000 +0000
++++ ncurses-6.2-20200321/test/aclocal.m4	2020-03-20 00:23:48.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.178 2020/03/08 14:13:15 tom Exp $
++dnl $Id: aclocal.m4,v 1.179 2020/03/20 00:23:48 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -43,7 +43,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ dnl ---------------------------------------------------------------------------
+-dnl AM_LANGINFO_CODESET version: 4 updated: 2015/04/18 08:56:57
++dnl AM_LANGINFO_CODESET version: 5 updated: 2020/03/10 18:53:47
+ dnl -------------------
+ dnl Inserted as requested by gettext 0.10.40
+ dnl File from /usr/share/aclocal
+@@ -56,7 +56,7 @@
+ [
+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+ 	[AC_TRY_LINK([#include ],
+-	[char* cs = nl_langinfo(CODESET);],
++	[char* cs = nl_langinfo(CODESET); (void)cs],
+ 	am_cv_langinfo_codeset=yes,
+ 	am_cv_langinfo_codeset=no)
+ 	])
+@@ -600,7 +600,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CONST_X_STRING version: 3 updated: 2020/01/11 18:39:22
++dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47
+ dnl -----------------
+ dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
+ dnl character-strings.
+@@ -630,7 +630,7 @@
+ #include 
+ #include 
+ ],
+-[String foo = malloc(1)],[
++[String foo = malloc(1); (void)foo],[
+ 
+ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
+ 	AC_TRY_COMPILE(
+@@ -1000,7 +1000,7 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CURSES_TERM_H version: 11 updated: 2015/04/15 19:08:48
++dnl CF_CURSES_TERM_H version: 12 updated: 2020/03/19 20:23:48
+ dnl ----------------
+ dnl SVr4 curses should have term.h as well (where it puts the definitions of
+ dnl the low-level interface).  This may not be true in old/broken implementations,
+@@ -1029,7 +1029,7 @@
+ 	AC_TRY_COMPILE([
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ #include <${cf_header}>],
+-	[WINDOW *x],
++	[WINDOW *x; (void)x],
+ 	[cf_cv_term_header=$cf_header
+ 	 break],
+ 	[cf_cv_term_header=no])
+@@ -1048,7 +1048,7 @@
+ #else
+ make an error
+ #endif],
+-			[WINDOW *x],
++			[WINDOW *x; (void)x],
+ 			[cf_cv_term_header=$cf_header
+ 			 break],
+ 			[cf_cv_term_header=no])
+@@ -1070,7 +1070,7 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CURSES_UNCTRL_H version: 4 updated: 2015/04/15 19:08:48
++dnl CF_CURSES_UNCTRL_H version: 5 updated: 2020/03/19 20:23:48
+ dnl ------------------
+ dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
+ dnl may put it in a subdirectory (along with ncurses' other headers, of
+@@ -1099,7 +1099,7 @@
+ 	AC_TRY_COMPILE([
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ #include <${cf_header}>],
+-	[WINDOW *x],
++	[WINDOW *x; (void)x],
+ 	[cf_cv_unctrl_header=$cf_header
+ 	 break],
+ 	[cf_cv_unctrl_header=no])
+@@ -1125,7 +1125,7 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CURSES_WACS_MAP version: 6 updated: 2012/10/06 08:57:51
++dnl CF_CURSES_WACS_MAP version: 7 updated: 2020/03/19 20:23:48
+ dnl ------------------
+ dnl Check for likely values of wacs_map[].
+ AC_DEFUN([CF_CURSES_WACS_MAP],
+@@ -1139,7 +1139,7 @@
+ #define _XOPEN_SOURCE_EXTENDED
+ #endif
+ #include <${cf_cv_ncurses_header:-curses.h}>],
+-	[void *foo = &($name['k'])],
++	[void *foo = &($name['k']); (void)foo],
+ 	[cf_cv_curses_wacs_map=$name
+ 	 break])
+ 	done])
+@@ -1147,7 +1147,7 @@
+ test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map,[Define to name of (n)curses wide-character array])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CURSES_WACS_SYMBOLS version: 2 updated: 2012/10/06 08:57:51
++dnl CF_CURSES_WACS_SYMBOLS version: 3 updated: 2020/03/19 20:23:48
+ dnl ----------------------
+ dnl Do a check to see if the WACS_xxx constants are defined compatibly with
+ dnl X/Open Curses.  In particular, NetBSD's implementation of the WACS_xxx
+@@ -1166,7 +1166,7 @@
+ #endif
+ #include <${cf_cv_ncurses_header:-curses.h}>],
+ 	[cchar_t *foo = WACS_PLUS;
+-	 $cf_cv_curses_wacs_map['k'] = *WACS_PLUS],
++	 $cf_cv_curses_wacs_map['k'] = *WACS_PLUS; (void)foo],
+ 	[cf_cv_curses_wacs_symbols=yes])
+ else
+ 	AC_TRY_LINK([
+@@ -1174,7 +1174,7 @@
+ #define _XOPEN_SOURCE_EXTENDED
+ #endif
+ #include <${cf_cv_ncurses_header:-curses.h}>],
+-	[cchar_t *foo = WACS_PLUS],
++	[cchar_t *foo = WACS_PLUS; (void)foo],
+ 	[cf_cv_curses_wacs_symbols=yes])
+ fi
+ ])
+@@ -1557,7 +1557,7 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00
++dnl CF_GCC_ATTRIBUTES version: 18 updated: 2020/03/10 18:53:47
+ dnl -----------------
+ dnl Test for availability of useful gcc __attribute__ directives to quiet
+ dnl compiler warnings.  Though useful, not all are supported -- and contrary
+@@ -1601,7 +1601,7 @@
+ extern void wow(char *,...) GCC_SCANFLIKE(1,2);
+ extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
+ extern void foo(void) GCC_NORETURN;
+-int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { return 0; }
++int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { (void)argc; (void)argv; return 0; }
+ EOF
+ 	cf_printf_attribute=no
+ 	cf_scanf_attribute=no
+@@ -3326,7 +3326,7 @@
+ done
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SIGWINCH version: 2 updated: 2019/03/23 19:54:44
++dnl CF_SIGWINCH version: 3 updated: 2020/03/10 18:53:47
+ dnl -----------
+ dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
+ dnl programs need this test).
+@@ -3341,7 +3341,7 @@
+ 	AC_TRY_COMPILE([
+ #include 
+ #include 
+-],[int x = SIGWINCH],
++],[int x = SIGWINCH; (void)x],
+ 	[cf_cv_define_sigwinch=yes],
+ 	[AC_TRY_COMPILE([
+ #undef _XOPEN_SOURCE
+@@ -3349,7 +3349,7 @@
+ #undef _POSIX_C_SOURCE
+ #include 
+ #include 
+-],[int x = SIGWINCH],
++],[int x = SIGWINCH; (void)x],
+ 	[cf_cv_define_sigwinch=maybe],
+ 	[cf_cv_define_sigwinch=no])
+ ])
+@@ -3371,7 +3371,7 @@
+ #if SIGWINCH != $cf_sigwinch
+ make an error
+ #endif
+-int x = SIGWINCH],
++int x = SIGWINCH; (void)x],
+ 	[cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break])
+ 
+@@ -3385,7 +3385,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SIG_ATOMIC_T version: 4 updated: 2020/01/18 12:30:44
++dnl CF_SIG_ATOMIC_T version: 5 updated: 2020/03/10 18:53:47
+ dnl ---------------
+ dnl signal handler, but there are some gcc dependencies in that recommendation.
+ dnl Try anyway.
+@@ -3407,6 +3407,7 @@
+ $cf_type x;
+ static void handler(int sig)
+ {
++	(void)sig;
+ 	x = 5;
+ }],
+ 		[signal(SIGINT, handler);
+@@ -3467,7 +3468,7 @@
+ test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT,1,[Define to 1 if we can include  with ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_TERM_HEADER version: 4 updated: 2015/04/15 19:08:48
++dnl CF_TERM_HEADER version: 5 updated: 2020/03/19 20:23:48
+ dnl --------------
+ dnl Look for term.h, which is part of X/Open curses.  It defines the interface
+ dnl to terminfo database.  Usually it is in the same include-path as curses.h,
+@@ -3488,7 +3489,7 @@
+ AC_TRY_COMPILE([#include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ #include <$cf_test>
+-],[int x = auto_left_margin],[
++],[int x = auto_left_margin; (void)x],[
+ 	cf_cv_term_header="$cf_test"],[
+ 	cf_cv_term_header=unknown
+ 	])
+@@ -3982,7 +3983,7 @@
+ AC_SUBST(no_x11_rgb)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_XOPEN_CURSES version: 14 updated: 2018/06/20 20:23:13
++dnl CF_XOPEN_CURSES version: 15 updated: 2020/03/19 20:23:48
+ dnl ---------------
+ dnl Test if we should define X/Open source for curses, needed on Digital Unix
+ dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
+@@ -4008,7 +4009,14 @@
+ #endif
+ 	long x = winnstr(stdscr, "", 0);
+ 	int x1, y1;
+-	getbegyx(stdscr, y1, x1)],
++#ifdef NCURSES_VERSION
++	(void)check2;
++#endif
++	getbegyx(stdscr, y1, x1);
++	(void)x;
++	(void)y1;
++	(void)x1;
++	],
+ 	[cf_cv_need_xopen_extension=none],
+ 	[
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+@@ -4023,7 +4031,14 @@
+ #endif
+ 		long x = winnstr(stdscr, "", 0);
+ 		int x1, y1;
+-		getbegyx(stdscr, y1, x1)],
++		getbegyx(stdscr, y1, x1);
++#ifdef NCURSES_VERSION
++		(void)check2;
++#endif
++		(void)x;
++		(void)y1;
++		(void)x1;
++		],
+ 		[cf_cv_need_xopen_extension=$cf_try_xopen_extension; break])
+ 	done
+ 	])
+@@ -4168,7 +4183,7 @@
+ fi # cf_cv_posix_visible
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_X_ATHENA version: 23 updated: 2015/04/12 15:39:00
++dnl CF_X_ATHENA version: 24 updated: 2020/03/10 18:53:47
+ dnl -----------
+ dnl Check for Xaw (Athena) libraries
+ dnl
+@@ -4244,7 +4259,8 @@
+ AC_TRY_LINK([
+ #include 
+ ],[
+-int check = XmuCompareISOLatin1("big", "small")
++int check = XmuCompareISOLatin1("big", "small");
++(void)check;
+ ],[cf_cv_xaw_compat=yes],[cf_cv_xaw_compat=no])])
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -4396,7 +4412,7 @@
+ 		[CF_ADD_LIB(Xext)])])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_X_TOOLKIT version: 24 updated: 2019/03/23 19:54:44
++dnl CF_X_TOOLKIT version: 25 updated: 2020/03/10 17:26:15
+ dnl ------------
+ dnl Check for X Toolkit libraries
+ AC_DEFUN([CF_X_TOOLKIT],
+@@ -4416,6 +4432,8 @@
+ 	CF_TRY_PKG_CONFIG(ice,,[AC_MSG_WARN(unable to find ICE library)])
+ 	CF_TRY_PKG_CONFIG(sm,,[AC_MSG_WARN(unable to find SM library)])
+ 	CF_TRY_PKG_CONFIG(xt,,[AC_MSG_WARN(unable to find Xt library)])
++else
++	LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
+ fi
+ 
+ cf_have_X_LIBS=no
+@@ -4448,7 +4466,7 @@
+ AC_CACHE_CHECK(for usable X Toolkit package,cf_cv_xt_ice_compat,[
+ AC_TRY_LINK([
+ #include 
+-],[int num = IceConnectionNumber(0)
++],[int num = IceConnectionNumber(0); (void) num
+ ],[cf_cv_xt_ice_compat=yes],[cf_cv_xt_ice_compat=no])])
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -4478,15 +4496,13 @@
+ 
+ 	AC_CHECK_FUNC(XOpenDisplay,,[
+ 	AC_CHECK_LIB(X11,XOpenDisplay,
+-		[CF_ADD_LIB(X11)],,
+-		[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])])
++		[CF_ADD_LIB(X11)])])
+ 
+ 	AC_CHECK_FUNC(XtAppInitialize,,[
+ 	AC_CHECK_LIB(Xt, XtAppInitialize,
+ 		[AC_DEFINE(HAVE_LIBXT,1,[Define to 1 if we can compile with the Xt library])
+ 		 cf_have_X_LIBS=Xt
+-		 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"],,
+-		[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])])
++		 LIBS="-lXt $LIBS"])])
+ ])
+ 
+ if test $cf_have_X_LIBS = no ; then
+Index: test/configure
+--- ncurses-6.2-20200314+/test/configure	2020-03-08 14:13:38.000000000 +0000
++++ ncurses-6.2-20200321/test/configure	2020-03-22 00:31:48.000000000 +0000
+@@ -3124,7 +3124,7 @@
+ extern void wow(char *,...) GCC_SCANFLIKE(1,2);
+ extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
+ extern void foo(void) GCC_NORETURN;
+-int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { return 0; }
++int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { (void)argc; (void)argv; return 0; }
+ EOF
+ 	cf_printf_attribute=no
+ 	cf_scanf_attribute=no
+@@ -5298,6 +5298,7 @@
+ $cf_type x;
+ static void handler(int sig)
+ {
++	(void)sig;
+ 	x = 5;
+ }
+ int
+@@ -5310,16 +5311,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5313: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5316: \$? = $ac_status" >&5
++  echo "$as_me:5317: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5322: \$? = $ac_status" >&5
++  echo "$as_me:5323: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -5333,7 +5334,7 @@
+ 
+ fi
+ 
+-echo "$as_me:5336: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:5337: 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 <&5
++echo "$as_me:5346: 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 5352 "configure"
++#line 5353 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -5358,29 +5359,29 @@
+ int
+ main (void)
+ {
+-int x = SIGWINCH
++int x = SIGWINCH; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5367: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5370: \$? = $ac_status" >&5
++  echo "$as_me:5371: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5376: \$? = $ac_status" >&5
++  echo "$as_me:5377: \$? = $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 5383 "configure"
++#line 5384 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -5392,22 +5393,22 @@
+ int
+ main (void)
+ {
+-int x = SIGWINCH
++int x = SIGWINCH; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5401: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5402: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5404: \$? = $ac_status" >&5
++  echo "$as_me:5405: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5410: \$? = $ac_status" >&5
++  echo "$as_me:5411: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -5421,11 +5422,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:5424: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:5425: 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:5428: checking for actual SIGWINCH definition" >&5
++echo "$as_me:5429: 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
+@@ -5436,7 +5437,7 @@
+ while test $cf_sigwinch != 1
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 5439 "configure"
++#line 5440 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -5452,22 +5453,22 @@
+ #if SIGWINCH != $cf_sigwinch
+ make an error
+ #endif
+-int x = SIGWINCH
++int x = SIGWINCH; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5461: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5462: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5464: \$? = $ac_status" >&5
++  echo "$as_me:5465: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5467: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5470: \$? = $ac_status" >&5
++  echo "$as_me:5471: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -5481,7 +5482,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5484: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:5485: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -5491,34 +5492,34 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:5494: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:5495: 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 5500 "configure"
++#line 5501 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+ main (void)
+ {
+-char* cs = nl_langinfo(CODESET);
++char* cs = nl_langinfo(CODESET); (void)cs
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5512: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5513: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5515: \$? = $ac_status" >&5
++  echo "$as_me:5516: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5519: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5521: \$? = $ac_status" >&5
++  echo "$as_me:5522: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -5529,7 +5530,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:5532: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:5533: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test $am_cv_langinfo_codeset = yes; then
+ 
+@@ -5539,7 +5540,7 @@
+ 
+ 	fi
+ 
+-echo "$as_me:5542: checking if you want to use pkg-config" >&5
++echo "$as_me:5543: 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.
+@@ -5549,7 +5550,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:5552: result: $cf_pkg_config" >&5
++echo "$as_me:5553: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case $cf_pkg_config in
+@@ -5561,7 +5562,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-echo "$as_me:5564: checking for $ac_word" >&5
++echo "$as_me:5565: 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
+@@ -5578,7 +5579,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:5581: found $ac_dir/$ac_word" >&5
++   echo "$as_me:5582: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -5589,10 +5590,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:5592: result: $PKG_CONFIG" >&5
++  echo "$as_me:5593: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:5595: result: no" >&5
++  echo "$as_me:5596: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5601,7 +5602,7 @@
+   ac_pt_PKG_CONFIG=$PKG_CONFIG
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:5604: checking for $ac_word" >&5
++echo "$as_me:5605: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5618,7 +5619,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:5621: found $ac_dir/$ac_word" >&5
++   echo "$as_me:5622: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -5630,10 +5631,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:5633: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:5634: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:5636: result: no" >&5
++  echo "$as_me:5637: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5676,18 +5677,18 @@
+ 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5679: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:5680: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ elif test "x$cf_pkg_config" != xno ; then
+-	{ echo "$as_me:5686: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:5687: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+-echo "$as_me:5690: checking if you want to see long compiling messages" >&5
++echo "$as_me:5691: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -5721,10 +5722,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:5724: result: $enableval" >&5
++echo "$as_me:5725: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:5727: checking for ncurses wrap-prefix" >&5
++echo "$as_me:5728: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -5734,10 +5735,10 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:5737: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:5738: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ 
+-echo "$as_me:5740: checking if you want to check for wide-character functions" >&5
++echo "$as_me:5741: checking if you want to check for wide-character functions" >&5
+ echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -5754,10 +5755,10 @@
+ 	cf_enable_widec=yes
+ 
+ fi;
+-echo "$as_me:5757: result: $cf_enable_widec" >&5
++echo "$as_me:5758: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+ 
+-echo "$as_me:5760: checking for specific curses-directory" >&5
++echo "$as_me:5761: checking for specific curses-directory" >&5
+ echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
+ 
+ # Check whether --with-curses-dir or --without-curses-dir was given.
+@@ -5767,7 +5768,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:5770: result: $cf_cv_curses_dir" >&5
++echo "$as_me:5771: result: $cf_cv_curses_dir" >&5
+ echo "${ECHO_T}$cf_cv_curses_dir" >&6
+ 
+ if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+@@ -5798,7 +5799,7 @@
+ 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5801: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:5802: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5834,7 +5835,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 5837 "configure"
++#line 5838 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5846,16 +5847,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5849: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5850: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5852: \$? = $ac_status" >&5
++  echo "$as_me:5853: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5855: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5858: \$? = $ac_status" >&5
++  echo "$as_me:5859: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -5872,7 +5873,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:5875: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5876: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5908,7 +5909,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}:5911: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5912: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -5921,7 +5922,7 @@
+ 
+ cf_cv_screen=curses
+ 
+-echo "$as_me:5924: checking for specified curses library type" >&5
++echo "$as_me:5925: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -5965,13 +5966,13 @@
+ fi;
+ fi;
+ 
+-echo "$as_me:5968: result: $cf_cv_screen" >&5
++echo "$as_me:5969: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+ 
+ case $cf_cv_screen in
+ (curses|curses_*)
+ 
+-echo "$as_me:5974: checking for extra include directories" >&5
++echo "$as_me:5975: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5997,7 +5998,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:6000: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:6001: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -6007,7 +6008,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6010: checking if we have identified curses headers" >&5
++echo "$as_me:6011: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6019,7 +6020,7 @@
+ 	curses.h  ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6022 "configure"
++#line 6023 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -6031,16 +6032,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6034: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6035: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6037: \$? = $ac_status" >&5
++  echo "$as_me:6038: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6040: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6041: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6043: \$? = $ac_status" >&5
++  echo "$as_me:6044: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -6051,11 +6052,11 @@
+ done
+ 
+ fi
+-echo "$as_me:6054: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:6055: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:6058: error: No curses header-files found" >&5
++	{ { echo "$as_me:6059: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6065,23 +6066,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6068: checking for $ac_header" >&5
++echo "$as_me:6069: 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 6074 "configure"
++#line 6075 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:6078: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6079: \"$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:6084: \$? = $ac_status" >&5
++  echo "$as_me:6085: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6100,7 +6101,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:6103: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6104: 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 <&5
++echo "$as_me:6114: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6128,7 +6129,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6131 "configure"
++#line 6132 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6137,22 +6138,22 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6146: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6147: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6149: \$? = $ac_status" >&5
++  echo "$as_me:6150: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6152: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6153: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6155: \$? = $ac_status" >&5
++  echo "$as_me:6156: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -6168,7 +6169,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6171: result: $cf_cv_term_header" >&5
++echo "$as_me:6172: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6200,7 +6201,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6203: checking for ncurses version" >&5
++echo "$as_me:6204: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6226,10 +6227,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6229: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6230: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6232: \$? = $ac_status" >&5
++  echo "$as_me:6233: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -6239,7 +6240,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6242 "configure"
++#line 6243 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6264,15 +6265,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:6267: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6268: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6270: \$? = $ac_status" >&5
++  echo "$as_me:6271: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:6272: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6275: \$? = $ac_status" >&5
++  echo "$as_me:6276: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6286,17 +6287,17 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:6289: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6290: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6296: checking if we have identified curses libraries" >&5
++echo "$as_me:6297: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6299 "configure"
++#line 6300 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6308,16 +6309,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6311: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6312: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6314: \$? = $ac_status" >&5
++  echo "$as_me:6315: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6320: \$? = $ac_status" >&5
++  echo "$as_me:6321: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -6326,13 +6327,13 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-echo "$as_me:6329: result: $cf_result" >&5
++echo "$as_me:6330: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case $host_os in
+ (freebsd*)
+-	echo "$as_me:6335: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:6336: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6340,7 +6341,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6343 "configure"
++#line 6344 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6359,16 +6360,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6362: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6363: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6365: \$? = $ac_status" >&5
++  echo "$as_me:6366: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6369: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6371: \$? = $ac_status" >&5
++  echo "$as_me:6372: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6379,7 +6380,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6382: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6383: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+ 
+@@ -6409,7 +6410,7 @@
+ 	# term.h) for cur_colr
+ 	if test "x$cf_cv_screen" = "xcurses_colr"
+ 	then
+-		echo "$as_me:6412: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:6413: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6417,7 +6418,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6420 "configure"
++#line 6421 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6436,16 +6437,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6439: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6440: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6442: \$? = $ac_status" >&5
++  echo "$as_me:6443: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6446: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6448: \$? = $ac_status" >&5
++  echo "$as_me:6449: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -6456,7 +6457,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6459: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:6460: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test $ac_cv_lib_cur_colr_initscr = yes; then
+ 
+@@ -6480,7 +6481,7 @@
+ 
+ else
+ 
+-		echo "$as_me:6483: checking for initscr in -lHcurses" >&5
++		echo "$as_me:6484: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6488,7 +6489,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6491 "configure"
++#line 6492 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6507,16 +6508,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6510: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6511: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6513: \$? = $ac_status" >&5
++  echo "$as_me:6514: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6517: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6519: \$? = $ac_status" >&5
++  echo "$as_me:6520: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -6527,7 +6528,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6530: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:6531: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test $ac_cv_lib_Hcurses_initscr = yes; then
+ 
+@@ -6585,7 +6586,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}:6588: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6589: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6614,7 +6615,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}:6617: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6618: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6645,7 +6646,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}:6648: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6649: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6680,7 +6681,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}:6683: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6684: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6724,13 +6725,13 @@
+ 	# because it may be needed to link the test-case for initscr.
+ 	if test "x$cf_term_lib" = x
+ 	then
+-		echo "$as_me:6727: checking for tgoto" >&5
++		echo "$as_me:6728: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6733 "configure"
++#line 6734 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6761,16 +6762,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6764: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6765: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6767: \$? = $ac_status" >&5
++  echo "$as_me:6768: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6770: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6771: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6773: \$? = $ac_status" >&5
++  echo "$as_me:6774: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_tgoto=yes
+ else
+@@ -6780,7 +6781,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6783: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:6784: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test $ac_cv_func_tgoto = yes; then
+   cf_term_lib=predefined
+@@ -6789,7 +6790,7 @@
+ 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ 			do
+ 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:6792: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:6793: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6797,7 +6798,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6800 "configure"
++#line 6801 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6816,16 +6817,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6819: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6820: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6822: \$? = $ac_status" >&5
++  echo "$as_me:6823: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6825: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6826: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6828: \$? = $ac_status" >&5
++  echo "$as_me:6829: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -6836,7 +6837,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6839: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:6840: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -6859,10 +6860,10 @@
+ 		do
+ 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+-				echo "$as_me:6862: checking if we can link with $cf_curs_lib library" >&5
++				echo "$as_me:6863: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 6865 "configure"
++#line 6866 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6874,16 +6875,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6877: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6878: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6880: \$? = $ac_status" >&5
++  echo "$as_me:6881: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6883: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6886: \$? = $ac_status" >&5
++  echo "$as_me:6887: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -6892,16 +6893,16 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-				echo "$as_me:6895: result: $cf_result" >&5
++				echo "$as_me:6896: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test $cf_result = yes && break
+ 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ 				cf_result=no
+ 			elif test "$cf_term_lib" != predefined ; then
+-				echo "$as_me:6901: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++				echo "$as_me:6902: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 6904 "configure"
++#line 6905 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6913,16 +6914,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6917: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6919: \$? = $ac_status" >&5
++  echo "$as_me:6920: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6923: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6925: \$? = $ac_status" >&5
++  echo "$as_me:6926: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=no
+ else
+@@ -6931,7 +6932,7 @@
+ 
+ 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ 					cat >conftest.$ac_ext <<_ACEOF
+-#line 6934 "configure"
++#line 6935 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6943,16 +6944,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6946: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6947: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6949: \$? = $ac_status" >&5
++  echo "$as_me:6950: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6952: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6953: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6955: \$? = $ac_status" >&5
++  echo "$as_me:6956: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -6964,13 +6965,13 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-				echo "$as_me:6967: result: $cf_result" >&5
++				echo "$as_me:6968: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test $cf_result != error && break
+ 			fi
+ 		done
+ 	fi
+-	test $cf_curs_lib = unknown && { { echo "$as_me:6973: error: no curses library found" >&5
++	test $cf_curs_lib = unknown && { { echo "$as_me:6974: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6979,7 +6980,7 @@
+ 	;;
+ (ncursesw*)
+ 
+-echo "$as_me:6982: checking for multibyte character support" >&5
++echo "$as_me:6983: 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
+@@ -6987,7 +6988,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6990 "configure"
++#line 6991 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7000,16 +7001,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7003: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7004: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7006: \$? = $ac_status" >&5
++  echo "$as_me:7007: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7010: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7012: \$? = $ac_status" >&5
++  echo "$as_me:7013: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -7021,12 +7022,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:7024: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7025: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7029 "configure"
++#line 7030 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7039,16 +7040,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7042: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7043: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7045: \$? = $ac_status" >&5
++  echo "$as_me:7046: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7049: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7051: \$? = $ac_status" >&5
++  echo "$as_me:7052: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7062,7 +7063,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7065 "configure"
++#line 7066 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7075,16 +7076,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7078: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7081: \$? = $ac_status" >&5
++  echo "$as_me:7082: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7087: \$? = $ac_status" >&5
++  echo "$as_me:7088: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7101,9 +7102,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:7104: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:7105: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:7106: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7107: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7194,7 +7195,7 @@
+ 		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}:7197: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7198: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -7202,7 +7203,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 7205 "configure"
++#line 7206 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7215,21 +7216,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7218: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7219: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7221: \$? = $ac_status" >&5
++  echo "$as_me:7222: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7224: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7225: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7227: \$? = $ac_status" >&5
++  echo "$as_me:7228: \$? = $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}:7232: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7233: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7247,7 +7248,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:7250: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7251: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -7322,13 +7323,13 @@
+ 				if test -d $cf_cv_library_path_utf8 ; then
+ 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:7325: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7326: 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 7331 "configure"
++#line 7332 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7341,21 +7342,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7344: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7345: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7347: \$? = $ac_status" >&5
++  echo "$as_me:7348: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7350: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7351: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7353: \$? = $ac_status" >&5
++  echo "$as_me:7354: \$? = $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}:7358: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7359: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -7397,7 +7398,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7400: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7401: 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
+@@ -7435,7 +7436,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 7438 "configure"
++#line 7439 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7447,16 +7448,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7450: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7451: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7453: \$? = $ac_status" >&5
++  echo "$as_me:7454: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7456: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7457: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7459: \$? = $ac_status" >&5
++  echo "$as_me:7460: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7473,7 +7474,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:7476: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7477: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7509,7 +7510,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}:7512: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7513: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7539,13 +7540,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:7542: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:7543: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:7545: result: yes" >&5
++		echo "$as_me:7546: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:7548: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:7549: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
+@@ -7678,7 +7679,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 7681 "configure"
++#line 7682 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7690,37 +7691,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7693: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7694: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7696: \$? = $ac_status" >&5
++  echo "$as_me:7697: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7699: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7702: \$? = $ac_status" >&5
++  echo "$as_me:7703: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7708 "configure"
++#line 7709 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 					int main(void)
+ 					{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7715: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7716: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7718: \$? = $ac_status" >&5
++  echo "$as_me:7719: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7721: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7723: \$? = $ac_status" >&5
++  echo "$as_me:7724: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -7866,7 +7867,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 7869 "configure"
++#line 7870 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7878,37 +7879,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7882: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7884: \$? = $ac_status" >&5
++  echo "$as_me:7885: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7887: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7888: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7890: \$? = $ac_status" >&5
++  echo "$as_me:7891: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7896 "configure"
++#line 7897 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7904: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7906: \$? = $ac_status" >&5
++  echo "$as_me:7907: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:7908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7911: \$? = $ac_status" >&5
++  echo "$as_me:7912: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -7925,7 +7926,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:7928: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:7929: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -7941,7 +7942,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:7944: checking for terminfo header" >&5
++echo "$as_me:7945: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7959,7 +7960,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7962 "configure"
++#line 7963 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7968,22 +7969,22 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7977: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7978: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7980: \$? = $ac_status" >&5
++  echo "$as_me:7981: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7983: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7984: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7986: \$? = $ac_status" >&5
++  echo "$as_me:7987: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7999,7 +8000,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8002: result: $cf_cv_term_header" >&5
++echo "$as_me:8003: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8034,7 +8035,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:8037: result: no" >&5
++		echo "$as_me:8038: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -8050,7 +8051,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:8053: checking for $ac_word" >&5
++echo "$as_me:8054: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8065,7 +8066,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:8068: found $ac_dir/$ac_word" >&5
++echo "$as_me:8069: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8073,10 +8074,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:8076: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:8077: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8079: result: no" >&5
++  echo "$as_me:8080: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8089,7 +8090,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:8092: checking for $ac_word" >&5
++echo "$as_me:8093: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8104,7 +8105,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:8107: found $ac_dir/$ac_word" >&5
++echo "$as_me:8108: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8112,10 +8113,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:8115: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:8116: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8118: result: no" >&5
++  echo "$as_me:8119: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8244,7 +8245,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:8247: checking if we have identified curses headers" >&5
++echo "$as_me:8248: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8256,7 +8257,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8259 "configure"
++#line 8260 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8268,16 +8269,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8271: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8272: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8274: \$? = $ac_status" >&5
++  echo "$as_me:8275: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8277: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8278: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8280: \$? = $ac_status" >&5
++  echo "$as_me:8281: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8288,11 +8289,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8291: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8292: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:8295: error: No curses header-files found" >&5
++	{ { echo "$as_me:8296: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8302,23 +8303,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8305: checking for $ac_header" >&5
++echo "$as_me:8306: 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 8311 "configure"
++#line 8312 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8315: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8316: \"$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:8321: \$? = $ac_status" >&5
++  echo "$as_me:8322: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8337,7 +8338,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:8340: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:8341: 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 <conftest.$ac_ext <<_ACEOF
+-#line 8396 "configure"
++#line 8397 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8405,16 +8406,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8408: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8409: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8411: \$? = $ac_status" >&5
++  echo "$as_me:8412: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8415: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8417: \$? = $ac_status" >&5
++  echo "$as_me:8418: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8431,7 +8432,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8434: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8435: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8450,7 +8451,7 @@
+ 
+ }
+ 
+-echo "$as_me:8453: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8454: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8462,7 +8463,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8465 "configure"
++#line 8466 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8486,16 +8487,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8489: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8490: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8492: \$? = $ac_status" >&5
++  echo "$as_me:8493: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8496: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8498: \$? = $ac_status" >&5
++  echo "$as_me:8499: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8510,14 +8511,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8513: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8514: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:8520: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8521: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8638,7 +8639,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8641 "configure"
++#line 8642 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8650,16 +8651,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8653: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8654: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8656: \$? = $ac_status" >&5
++  echo "$as_me:8657: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8660: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8662: \$? = $ac_status" >&5
++  echo "$as_me:8663: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8676,7 +8677,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8679: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8680: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8699,7 +8700,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8702 "configure"
++#line 8703 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8723,16 +8724,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8726: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8727: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8729: \$? = $ac_status" >&5
++  echo "$as_me:8730: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8732: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8733: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8735: \$? = $ac_status" >&5
++  echo "$as_me:8736: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8753,12 +8754,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8756: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8757: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8761: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8762: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
+@@ -8794,7 +8795,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8797 "configure"
++#line 8798 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8806,16 +8807,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8809: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8810: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8812: \$? = $ac_status" >&5
++  echo "$as_me:8813: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8815: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8818: \$? = $ac_status" >&5
++  echo "$as_me:8819: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8832,7 +8833,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8835: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8836: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8880,7 +8881,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:8883: checking for terminfo header" >&5
++echo "$as_me:8884: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8898,7 +8899,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8901 "configure"
++#line 8902 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8907,22 +8908,22 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8916: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8917: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8919: \$? = $ac_status" >&5
++  echo "$as_me:8920: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8923: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8925: \$? = $ac_status" >&5
++  echo "$as_me:8926: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8938,7 +8939,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8941: result: $cf_cv_term_header" >&5
++echo "$as_me:8942: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8976,7 +8977,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:8979: checking for ncurses version" >&5
++echo "$as_me:8980: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9002,10 +9003,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:9005: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:9006: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9008: \$? = $ac_status" >&5
++  echo "$as_me:9009: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -9015,7 +9016,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9018 "configure"
++#line 9019 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9040,15 +9041,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9043: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9046: \$? = $ac_status" >&5
++  echo "$as_me:9047: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9049: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9051: \$? = $ac_status" >&5
++  echo "$as_me:9052: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9062,7 +9063,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:9065: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9066: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9075,7 +9076,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9078: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9079: 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
+@@ -9083,7 +9084,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9086 "configure"
++#line 9087 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9102,16 +9103,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9105: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9106: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9108: \$? = $ac_status" >&5
++  echo "$as_me:9109: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9111: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9112: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9114: \$? = $ac_status" >&5
++  echo "$as_me:9115: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9122,10 +9123,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9125: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9126: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+-  echo "$as_me:9128: checking for initscr in -lgpm" >&5
++  echo "$as_me:9129: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9133,7 +9134,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9136 "configure"
++#line 9137 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9152,16 +9153,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9155: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9158: \$? = $ac_status" >&5
++  echo "$as_me:9159: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9161: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9164: \$? = $ac_status" >&5
++  echo "$as_me:9165: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9172,7 +9173,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9175: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9176: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test $ac_cv_lib_gpm_initscr = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -9187,7 +9188,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:9190: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:9191: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9195,7 +9196,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9198 "configure"
++#line 9199 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9214,16 +9215,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9217: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9218: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9220: \$? = $ac_status" >&5
++  echo "$as_me:9221: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9223: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9224: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9226: \$? = $ac_status" >&5
++  echo "$as_me:9227: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9234,7 +9235,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9237: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9238: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -9283,13 +9284,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9286: checking for initscr" >&5
++	echo "$as_me:9287: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9292 "configure"
++#line 9293 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9320,16 +9321,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9323: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9324: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9326: \$? = $ac_status" >&5
++  echo "$as_me:9327: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9330: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9332: \$? = $ac_status" >&5
++  echo "$as_me:9333: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9339,18 +9340,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9342: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9343: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test $ac_cv_func_initscr = yes; then
+   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:9349: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9350: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9353 "configure"
++#line 9354 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9362,25 +9363,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9366: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9368: \$? = $ac_status" >&5
++  echo "$as_me:9369: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9372: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9374: \$? = $ac_status" >&5
++  echo "$as_me:9375: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9376: result: yes" >&5
++  echo "$as_me:9377: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9383: result: no" >&5
++echo "$as_me:9384: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9448,11 +9449,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9451: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9452: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 9455 "configure"
++#line 9456 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9464,25 +9465,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9467: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9468: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9470: \$? = $ac_status" >&5
++  echo "$as_me:9471: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9473: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9476: \$? = $ac_status" >&5
++  echo "$as_me:9477: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9478: result: yes" >&5
++  echo "$as_me:9479: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9485: result: no" >&5
++echo "$as_me:9486: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9497,7 +9498,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:9500: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9501: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9505,7 +9506,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9508: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9509: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -9515,7 +9516,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9518 "configure"
++#line 9519 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9527,23 +9528,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9531: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9533: \$? = $ac_status" >&5
++  echo "$as_me:9534: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9537: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9539: \$? = $ac_status" >&5
++  echo "$as_me:9540: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9541: result: yes" >&5
++  echo "$as_me:9542: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9546: result: no" >&5
++echo "$as_me:9547: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9568,13 +9569,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:9571: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:9572: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:9574: result: yes" >&5
++		echo "$as_me:9575: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:9577: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:9578: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
+@@ -9707,7 +9708,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 9710 "configure"
++#line 9711 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9719,37 +9720,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9722: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9723: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9725: \$? = $ac_status" >&5
++  echo "$as_me:9726: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9728: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9729: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9731: \$? = $ac_status" >&5
++  echo "$as_me:9732: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9737 "configure"
++#line 9738 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 					int main(void)
+ 					{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9744: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9745: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9747: \$? = $ac_status" >&5
++  echo "$as_me:9748: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9752: \$? = $ac_status" >&5
++  echo "$as_me:9753: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -9895,7 +9896,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9898 "configure"
++#line 9899 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9907,37 +9908,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9910: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9911: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9913: \$? = $ac_status" >&5
++  echo "$as_me:9914: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9916: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9917: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9919: \$? = $ac_status" >&5
++  echo "$as_me:9920: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9925 "configure"
++#line 9926 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9932: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9933: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9935: \$? = $ac_status" >&5
++  echo "$as_me:9936: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9938: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9940: \$? = $ac_status" >&5
++  echo "$as_me:9941: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9954,7 +9955,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:9957: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9958: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -9970,7 +9971,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9973: checking for terminfo header" >&5
++echo "$as_me:9974: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9988,7 +9989,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9991 "configure"
++#line 9992 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9997,22 +9998,22 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10006: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10007: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10009: \$? = $ac_status" >&5
++  echo "$as_me:10010: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10012: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10015: \$? = $ac_status" >&5
++  echo "$as_me:10016: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10028,7 +10029,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10031: result: $cf_cv_term_header" >&5
++echo "$as_me:10032: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10063,7 +10064,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:10066: result: no" >&5
++		echo "$as_me:10067: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -10079,7 +10080,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:10082: checking for $ac_word" >&5
++echo "$as_me:10083: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10094,7 +10095,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:10097: found $ac_dir/$ac_word" >&5
++echo "$as_me:10098: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10102,10 +10103,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:10105: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:10106: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10108: result: no" >&5
++  echo "$as_me:10109: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10118,7 +10119,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:10121: checking for $ac_word" >&5
++echo "$as_me:10122: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10133,7 +10134,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:10136: found $ac_dir/$ac_word" >&5
++echo "$as_me:10137: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10141,10 +10142,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:10144: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:10145: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10147: result: no" >&5
++  echo "$as_me:10148: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10273,7 +10274,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:10276: checking if we have identified curses headers" >&5
++echo "$as_me:10277: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10285,7 +10286,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10288 "configure"
++#line 10289 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10297,16 +10298,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10300: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10301: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10303: \$? = $ac_status" >&5
++  echo "$as_me:10304: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10306: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10309: \$? = $ac_status" >&5
++  echo "$as_me:10310: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10317,11 +10318,11 @@
+ done
+ 
+ fi
+-echo "$as_me:10320: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10321: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:10324: error: No curses header-files found" >&5
++	{ { echo "$as_me:10325: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10331,23 +10332,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10334: checking for $ac_header" >&5
++echo "$as_me:10335: 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 10340 "configure"
++#line 10341 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10344: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10345: \"$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:10350: \$? = $ac_status" >&5
++  echo "$as_me:10351: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10366,7 +10367,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:10369: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:10370: 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 <conftest.$ac_ext <<_ACEOF
+-#line 10425 "configure"
++#line 10426 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10434,16 +10435,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10437: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10438: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10440: \$? = $ac_status" >&5
++  echo "$as_me:10441: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10443: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10444: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10446: \$? = $ac_status" >&5
++  echo "$as_me:10447: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10460,7 +10461,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10463: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10464: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10479,7 +10480,7 @@
+ 
+ }
+ 
+-echo "$as_me:10482: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10483: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10491,7 +10492,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10494 "configure"
++#line 10495 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10515,16 +10516,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10518: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10519: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10521: \$? = $ac_status" >&5
++  echo "$as_me:10522: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10525: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10527: \$? = $ac_status" >&5
++  echo "$as_me:10528: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -10539,14 +10540,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:10542: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10543: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:10549: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10550: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10667,7 +10668,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 10670 "configure"
++#line 10671 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10679,16 +10680,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10682: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10683: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10685: \$? = $ac_status" >&5
++  echo "$as_me:10686: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10691: \$? = $ac_status" >&5
++  echo "$as_me:10692: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10705,7 +10706,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10708: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10709: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10728,7 +10729,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 10731 "configure"
++#line 10732 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10752,16 +10753,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10756: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10758: \$? = $ac_status" >&5
++  echo "$as_me:10759: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10762: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10764: \$? = $ac_status" >&5
++  echo "$as_me:10765: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -10782,12 +10783,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10785: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10786: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:10790: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:10791: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
+@@ -10823,7 +10824,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 10826 "configure"
++#line 10827 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10835,16 +10836,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10838: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10839: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10841: \$? = $ac_status" >&5
++  echo "$as_me:10842: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10845: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10847: \$? = $ac_status" >&5
++  echo "$as_me:10848: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -10861,7 +10862,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10864: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10865: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10909,7 +10910,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10912: checking for terminfo header" >&5
++echo "$as_me:10913: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10927,7 +10928,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10930 "configure"
++#line 10931 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10936,22 +10937,22 @@
+ int
+ main (void)
+ {
+-int x = auto_left_margin
++int x = auto_left_margin; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10945: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10946: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10948: \$? = $ac_status" >&5
++  echo "$as_me:10949: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10952: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10954: \$? = $ac_status" >&5
++  echo "$as_me:10955: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10967,7 +10968,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10970: result: $cf_cv_term_header" >&5
++echo "$as_me:10971: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11005,7 +11006,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:11008: checking for ncurses version" >&5
++echo "$as_me:11009: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11031,10 +11032,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:11034: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:11035: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11037: \$? = $ac_status" >&5
++  echo "$as_me:11038: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -11044,7 +11045,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11047 "configure"
++#line 11048 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11069,15 +11070,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:11072: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11073: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11075: \$? = $ac_status" >&5
++  echo "$as_me:11076: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:11077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11078: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11080: \$? = $ac_status" >&5
++  echo "$as_me:11081: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -11091,7 +11092,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:11094: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:11095: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -11104,7 +11105,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:11107: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:11108: 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
+@@ -11112,7 +11113,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11115 "configure"
++#line 11116 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11131,16 +11132,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11134: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11135: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11137: \$? = $ac_status" >&5
++  echo "$as_me:11138: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11140: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11141: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11143: \$? = $ac_status" >&5
++  echo "$as_me:11144: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -11151,10 +11152,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11154: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:11155: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+-  echo "$as_me:11157: checking for initscr in -lgpm" >&5
++  echo "$as_me:11158: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11162,7 +11163,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11165 "configure"
++#line 11166 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11181,16 +11182,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11184: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11185: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11187: \$? = $ac_status" >&5
++  echo "$as_me:11188: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11190: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11193: \$? = $ac_status" >&5
++  echo "$as_me:11194: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -11201,7 +11202,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11204: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11205: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test $ac_cv_lib_gpm_initscr = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -11216,7 +11217,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:11219: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:11220: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11224,7 +11225,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11227 "configure"
++#line 11228 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11243,16 +11244,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11246: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11247: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11249: \$? = $ac_status" >&5
++  echo "$as_me:11250: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11252: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11253: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11255: \$? = $ac_status" >&5
++  echo "$as_me:11256: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11263,7 +11264,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11266: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11267: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -11312,13 +11313,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:11315: checking for initscr" >&5
++	echo "$as_me:11316: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11321 "configure"
++#line 11322 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11349,16 +11350,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11353: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11355: \$? = $ac_status" >&5
++  echo "$as_me:11356: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11361: \$? = $ac_status" >&5
++  echo "$as_me:11362: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -11368,18 +11369,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11371: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11372: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test $ac_cv_func_initscr = yes; then
+   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:11378: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:11379: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 11382 "configure"
++#line 11383 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11391,25 +11392,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11394: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11395: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11397: \$? = $ac_status" >&5
++  echo "$as_me:11398: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11401: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11403: \$? = $ac_status" >&5
++  echo "$as_me:11404: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:11405: result: yes" >&5
++  echo "$as_me:11406: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11412: result: no" >&5
++echo "$as_me:11413: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -11477,11 +11478,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:11480: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:11481: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >conftest.$ac_ext <<_ACEOF
+-#line 11484 "configure"
++#line 11485 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11493,25 +11494,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11496: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11497: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11499: \$? = $ac_status" >&5
++  echo "$as_me:11500: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11502: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11505: \$? = $ac_status" >&5
++  echo "$as_me:11506: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:11507: result: yes" >&5
++  echo "$as_me:11508: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11514: result: no" >&5
++echo "$as_me:11515: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -11526,7 +11527,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:11529: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:11530: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11534,7 +11535,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:11537: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:11538: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -11544,7 +11545,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11547 "configure"
++#line 11548 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11556,23 +11557,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11559: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11560: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11562: \$? = $ac_status" >&5
++  echo "$as_me:11563: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11565: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11566: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11568: \$? = $ac_status" >&5
++  echo "$as_me:11569: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:11570: result: yes" >&5
++  echo "$as_me:11571: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11575: result: no" >&5
++echo "$as_me:11576: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11592,7 +11593,7 @@
+ 
+ 	;;
+ (pdcurses)
+-	echo "$as_me:11595: checking for X" >&5
++	echo "$as_me:11596: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -11696,17 +11697,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11699 "configure"
++#line 11700 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:11703: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11704: \"$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:11709: \$? = $ac_status" >&5
++  echo "$as_me:11710: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11739,7 +11740,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11742 "configure"
++#line 11743 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11751,16 +11752,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11754: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11755: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11757: \$? = $ac_status" >&5
++  echo "$as_me:11758: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11763: \$? = $ac_status" >&5
++  echo "$as_me:11764: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -11798,7 +11799,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:11801: result: $have_x" >&5
++  echo "$as_me:11802: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -11808,7 +11809,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:11811: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:11812: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -11832,11 +11833,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:11835: checking whether -R must be followed by a space" >&5
++      echo "$as_me:11836: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >conftest.$ac_ext <<_ACEOF
+-#line 11839 "configure"
++#line 11840 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11848,16 +11849,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11852: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11854: \$? = $ac_status" >&5
++  echo "$as_me:11855: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11858: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11860: \$? = $ac_status" >&5
++  echo "$as_me:11861: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -11867,13 +11868,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:11870: result: no" >&5
++	echo "$as_me:11871: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11876 "configure"
++#line 11877 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11885,16 +11886,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11888: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11889: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11891: \$? = $ac_status" >&5
++  echo "$as_me:11892: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11894: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11897: \$? = $ac_status" >&5
++  echo "$as_me:11898: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_space=yes
+ else
+@@ -11904,11 +11905,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:11907: result: yes" >&5
++	  echo "$as_me:11908: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:11911: result: neither works" >&5
++	  echo "$as_me:11912: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -11928,7 +11929,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 11931 "configure"
++#line 11932 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11947,22 +11948,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11950: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11951: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11953: \$? = $ac_status" >&5
++  echo "$as_me:11954: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11956: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11957: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11959: \$? = $ac_status" >&5
++  echo "$as_me:11960: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:11965: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:11966: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11970,7 +11971,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11973 "configure"
++#line 11974 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11989,16 +11990,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11992: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11993: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11995: \$? = $ac_status" >&5
++  echo "$as_me:11996: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11999: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12001: \$? = $ac_status" >&5
++  echo "$as_me:12002: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -12009,14 +12010,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12012: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:12013: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:12019: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:12020: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12024,7 +12025,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12027 "configure"
++#line 12028 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12043,16 +12044,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12046: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12047: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12049: \$? = $ac_status" >&5
++  echo "$as_me:12050: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12055: \$? = $ac_status" >&5
++  echo "$as_me:12056: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -12063,7 +12064,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12066: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:12067: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -12082,13 +12083,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:12085: checking for gethostbyname" >&5
++    echo "$as_me:12086: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12091 "configure"
++#line 12092 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12119,16 +12120,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12123: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12125: \$? = $ac_status" >&5
++  echo "$as_me:12126: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12131: \$? = $ac_status" >&5
++  echo "$as_me:12132: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -12138,11 +12139,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12141: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:12142: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:12145: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:12146: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12150,7 +12151,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12153 "configure"
++#line 12154 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12169,16 +12170,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12173: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12175: \$? = $ac_status" >&5
++  echo "$as_me:12176: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12179: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12181: \$? = $ac_status" >&5
++  echo "$as_me:12182: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -12189,14 +12190,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12192: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:12193: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:12199: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:12200: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12204,7 +12205,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12207 "configure"
++#line 12208 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12223,16 +12224,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12226: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12227: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12229: \$? = $ac_status" >&5
++  echo "$as_me:12230: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12232: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12235: \$? = $ac_status" >&5
++  echo "$as_me:12236: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -12243,7 +12244,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12246: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:12247: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -12259,13 +12260,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:12262: checking for connect" >&5
++    echo "$as_me:12263: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12268 "configure"
++#line 12269 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12296,16 +12297,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12299: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12300: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12302: \$? = $ac_status" >&5
++  echo "$as_me:12303: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12305: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12306: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12308: \$? = $ac_status" >&5
++  echo "$as_me:12309: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -12315,11 +12316,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12318: result: $ac_cv_func_connect" >&5
++echo "$as_me:12319: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:12322: checking for connect in -lsocket" >&5
++      echo "$as_me:12323: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12327,7 +12328,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12330 "configure"
++#line 12331 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12346,16 +12347,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12350: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12352: \$? = $ac_status" >&5
++  echo "$as_me:12353: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12358: \$? = $ac_status" >&5
++  echo "$as_me:12359: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -12366,7 +12367,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12369: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:12370: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -12375,13 +12376,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:12378: checking for remove" >&5
++    echo "$as_me:12379: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12384 "configure"
++#line 12385 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12412,16 +12413,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12416: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12418: \$? = $ac_status" >&5
++  echo "$as_me:12419: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12422: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12424: \$? = $ac_status" >&5
++  echo "$as_me:12425: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -12431,11 +12432,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12434: result: $ac_cv_func_remove" >&5
++echo "$as_me:12435: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:12438: checking for remove in -lposix" >&5
++      echo "$as_me:12439: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12443,7 +12444,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12446 "configure"
++#line 12447 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12462,16 +12463,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12465: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12466: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12468: \$? = $ac_status" >&5
++  echo "$as_me:12469: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12472: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12474: \$? = $ac_status" >&5
++  echo "$as_me:12475: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -12482,7 +12483,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12485: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:12486: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -12491,13 +12492,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:12494: checking for shmat" >&5
++    echo "$as_me:12495: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12500 "configure"
++#line 12501 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12528,16 +12529,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12531: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12532: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12534: \$? = $ac_status" >&5
++  echo "$as_me:12535: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12537: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12540: \$? = $ac_status" >&5
++  echo "$as_me:12541: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -12547,11 +12548,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12550: result: $ac_cv_func_shmat" >&5
++echo "$as_me:12551: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:12554: checking for shmat in -lipc" >&5
++      echo "$as_me:12555: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12559,7 +12560,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12562 "configure"
++#line 12563 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12578,16 +12579,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12581: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12582: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12584: \$? = $ac_status" >&5
++  echo "$as_me:12585: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12587: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12588: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12590: \$? = $ac_status" >&5
++  echo "$as_me:12591: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -12598,7 +12599,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12601: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:12602: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -12616,7 +12617,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:12619: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:12620: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12624,7 +12625,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12627 "configure"
++#line 12628 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12643,16 +12644,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12646: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12647: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12649: \$? = $ac_status" >&5
++  echo "$as_me:12650: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12653: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12655: \$? = $ac_status" >&5
++  echo "$as_me:12656: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -12663,7 +12664,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12666: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:12667: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -12675,7 +12676,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:12678: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:12679: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12686,14 +12687,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:12689: result: yes" >&5
++	echo "$as_me:12690: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12692: result: no" >&5
++	echo "$as_me:12693: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12696: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:12697: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12704,14 +12705,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3dxft
+-	echo "$as_me:12707: result: yes" >&5
++	echo "$as_me:12708: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12710: result: no" >&5
++	echo "$as_me:12711: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12714: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:12715: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12722,14 +12723,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:12725: result: yes" >&5
++	echo "$as_me:12726: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12728: result: no" >&5
++	echo "$as_me:12729: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12732: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:12733: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+ 
+@@ -12740,10 +12741,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:12743: result: yes" >&5
++	echo "$as_me:12744: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:12746: result: no" >&5
++	echo "$as_me:12747: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -12763,17 +12764,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
+ 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
+ 
+-echo "${as_me:-configure}:12766: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:12767: testing found package $cf_athena_pkg ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:12772: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12773: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:12776: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12777: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -12904,20 +12905,20 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:12907: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:12908: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
+ 
+-echo "$as_me:12913: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:12914: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12920 "configure"
++#line 12921 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12926,23 +12927,24 @@
+ main (void)
+ {
+ 
+-int check = XmuCompareISOLatin1("big", "small")
++int check = XmuCompareISOLatin1("big", "small");
++(void)check;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12936: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12938: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12939: \$? = $ac_status" >&5
++  echo "$as_me:12941: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12944: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12945: \$? = $ac_status" >&5
++  echo "$as_me:12947: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -12952,7 +12954,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12955: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:12957: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -12964,7 +12966,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:12967: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:12969: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -12972,17 +12974,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:12975: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:12977: testing found package xmu ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:12981: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:12983: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:12985: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:12987: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13102,12 +13104,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13105: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:13107: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13110: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:13112: testing ...after  $LIBS ..." 1>&5
+ 
+ else
+ 	cf_pkgconfig_incs=
+@@ -13115,12 +13117,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13118: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:13120: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13123: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:13125: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -13131,7 +13133,7 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:13134: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:13136: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -13156,17 +13158,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:13159: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:13161: testing found package Xext ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13165: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13167: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13169: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13171: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13287,7 +13289,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:13290: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:13292: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13295,7 +13297,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13298 "configure"
++#line 13300 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13314,16 +13316,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13317: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13319: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13320: \$? = $ac_status" >&5
++  echo "$as_me:13322: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13325: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13326: \$? = $ac_status" >&5
++  echo "$as_me:13328: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -13334,7 +13336,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13337: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:13339: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
+ 
+@@ -13370,17 +13372,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:13373: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:13375: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13379: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13381: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13383: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13385: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13500,24 +13502,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13503: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:13505: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:13510: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:13512: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13516: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13518: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13520: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13522: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13637,24 +13639,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13640: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:13642: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:13647: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:13649: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13653: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13655: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13657: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13659: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13774,24 +13776,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13777: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:13779: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:13784: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:13786: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13790: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13792: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13794: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13796: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -13911,10 +13913,12 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:13914: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:13916: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
++else
++	LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
+ fi
+ 
+ cf_have_X_LIBS=no
+@@ -13922,17 +13926,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:13925: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:13929: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13931: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13935: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13935: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13939: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14053,14 +14057,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:14056: checking for usable X dependency" >&5
++echo "$as_me:14060: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14063 "configure"
++#line 14067 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14079,16 +14083,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14086: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14085: \$? = $ac_status" >&5
++  echo "$as_me:14089: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14092: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14091: \$? = $ac_status" >&5
++  echo "$as_me:14095: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -14098,30 +14102,30 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14101: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:14105: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ 		if test "$cf_cv_xt_x11_compat" = no
+ 		then
+ 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+ 
+-echo "${as_me:-configure}:14107: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:14111: testing work around broken X11 dependency ..." 1>&5
+ 
+ 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:14114: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14118: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14120: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14124: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14124: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14128: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14244,12 +14248,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14247: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14251: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14252: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14256: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14257,14 +14261,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:14260: checking for usable X Toolkit package" >&5
++echo "$as_me:14264: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14267 "configure"
++#line 14271 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14272,23 +14276,23 @@
+ int
+ main (void)
+ {
+-int num = IceConnectionNumber(0)
++int num = IceConnectionNumber(0); (void) num
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14282: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14286: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14285: \$? = $ac_status" >&5
++  echo "$as_me:14289: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14292: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14291: \$? = $ac_status" >&5
++  echo "$as_me:14295: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -14298,7 +14302,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14301: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:14305: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -14312,22 +14316,22 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:14315: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:14319: testing work around broken ICE dependency ..." 1>&5
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:14320: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14324: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14326: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14330: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14330: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14334: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14446,17 +14450,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:14449: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14453: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14455: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14459: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14459: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14463: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14585,12 +14589,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14588: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14592: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14593: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14597: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14610,7 +14614,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:14613: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14617: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -14695,7 +14699,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:14698: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:14702: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14705,7 +14709,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14708: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:14712: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14715,7 +14719,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14718: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:14722: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -14724,7 +14728,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14727 "configure"
++#line 14731 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14736,16 +14740,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14739: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14743: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14742: \$? = $ac_status" >&5
++  echo "$as_me:14746: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14745: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14749: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14748: \$? = $ac_status" >&5
++  echo "$as_me:14752: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -14753,12 +14757,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:14756: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14760: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:14761: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:14765: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_flags"
+@@ -14766,13 +14770,13 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-	echo "$as_me:14769: checking for XOpenDisplay" >&5
++	echo "$as_me:14773: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14775 "configure"
++#line 14779 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14803,16 +14807,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14806: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14810: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14809: \$? = $ac_status" >&5
++  echo "$as_me:14813: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14812: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14815: \$? = $ac_status" >&5
++  echo "$as_me:14819: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -14822,21 +14826,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14825: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:14829: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test $ac_cv_func_XOpenDisplay = yes; then
+   :
+ else
+ 
+-	echo "$as_me:14831: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:14835: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
++LIBS="-lX11  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14839 "configure"
++#line 14843 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14855,16 +14859,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14858: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14862: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14861: \$? = $ac_status" >&5
++  echo "$as_me:14865: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14868: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14867: \$? = $ac_status" >&5
++  echo "$as_me:14871: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -14875,7 +14879,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14878: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:14882: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+ 
+@@ -14899,13 +14903,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:14902: checking for XtAppInitialize" >&5
++	echo "$as_me:14906: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14908 "configure"
++#line 14912 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -14936,16 +14940,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14939: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14943: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14942: \$? = $ac_status" >&5
++  echo "$as_me:14946: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14949: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14948: \$? = $ac_status" >&5
++  echo "$as_me:14952: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -14955,21 +14959,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14958: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:14962: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test $ac_cv_func_XtAppInitialize = yes; then
+   :
+ else
+ 
+-	echo "$as_me:14964: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:14968: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
++LIBS="-lXt  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14972 "configure"
++#line 14976 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14988,16 +14992,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14991: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14995: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14994: \$? = $ac_status" >&5
++  echo "$as_me:14998: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15000: \$? = $ac_status" >&5
++  echo "$as_me:15004: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -15008,7 +15012,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15011: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:15015: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
+ 
+@@ -15017,7 +15021,7 @@
+ EOF
+ 
+ 		 cf_have_X_LIBS=Xt
+-		 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
++		 LIBS="-lXt $LIBS"
+ fi
+ 
+ fi
+@@ -15025,7 +15029,7 @@
+ fi
+ 
+ if test $cf_have_X_LIBS = no ; then
+-	{ echo "$as_me:15028: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:15032: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program.  You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -15066,14 +15070,14 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+ 
+-			echo "$as_me:15069: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:15073: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ 		else
+-			echo "$as_me:15072: checking for $cf_test" >&5
++			echo "$as_me:15076: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15076 "configure"
++#line 15080 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15087,16 +15091,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15090: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15094: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15093: \$? = $ac_status" >&5
++  echo "$as_me:15097: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15096: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15100: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15099: \$? = $ac_status" >&5
++  echo "$as_me:15103: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -15105,7 +15109,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-		echo "$as_me:15108: result: $cf_result" >&5
++		echo "$as_me:15112: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -15121,7 +15125,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:15124: WARNING: Unable to find Athena header files" >&5
++	{ echo "$as_me:15128: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ 
+@@ -15186,10 +15190,10 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-		echo "$as_me:15189: checking for $cf_test in $cf_libs" >&5
++		echo "$as_me:15193: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15192 "configure"
++#line 15196 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15205,16 +15209,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15208: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15212: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15211: \$? = $ac_status" >&5
++  echo "$as_me:15215: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15214: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15218: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15217: \$? = $ac_status" >&5
++  echo "$as_me:15221: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -15223,7 +15227,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:15226: result: $cf_result" >&5
++		echo "$as_me:15230: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -15240,7 +15244,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:15243: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:15247: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -15274,7 +15278,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:15277: checking for $ac_word" >&5
++echo "$as_me:15281: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15289,7 +15293,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:15292: found $ac_dir/$ac_word" >&5
++echo "$as_me:15296: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -15297,10 +15301,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:15300: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:15304: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:15303: result: no" >&5
++  echo "$as_me:15307: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -15313,7 +15317,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:15316: checking for $ac_word" >&5
++echo "$as_me:15320: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15328,7 +15332,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:15331: found $ac_dir/$ac_word" >&5
++echo "$as_me:15335: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -15336,10 +15340,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:15339: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:15343: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:15342: result: no" >&5
++  echo "$as_me:15346: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -15474,7 +15478,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15477: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15481: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15559,7 +15563,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15562: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15566: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15569,7 +15573,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15572: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15576: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15579,7 +15583,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15582: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15586: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -15588,7 +15592,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15591 "configure"
++#line 15595 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15600,16 +15604,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15603: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15607: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15606: \$? = $ac_status" >&5
++  echo "$as_me:15610: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15609: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15613: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15612: \$? = $ac_status" >&5
++  echo "$as_me:15616: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -15617,12 +15621,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15620: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15624: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15625: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15629: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_flags"
+@@ -15630,7 +15634,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:15633: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:15637: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15638,7 +15642,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15641 "configure"
++#line 15645 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15657,16 +15661,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15660: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15664: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15663: \$? = $ac_status" >&5
++  echo "$as_me:15667: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15666: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15669: \$? = $ac_status" >&5
++  echo "$as_me:15673: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -15677,7 +15681,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15680: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:15684: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+ 
+@@ -15699,7 +15703,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15702: checking for XCurses library" >&5
++echo "$as_me:15706: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15722,7 +15726,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15725 "configure"
++#line 15729 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15737,16 +15741,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15740: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15744: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15743: \$? = $ac_status" >&5
++  echo "$as_me:15747: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15749: \$? = $ac_status" >&5
++  echo "$as_me:15753: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -15757,7 +15761,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:15760: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:15764: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -15772,23 +15776,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:15775: checking for xcurses.h" >&5
++	echo "$as_me:15779: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15781 "configure"
++#line 15785 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15785: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15789: \"$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:15791: \$? = $ac_status" >&5
++  echo "$as_me:15795: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15807,7 +15811,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15810: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:15814: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test $ac_cv_header_xcurses_h = yes; then
+ 
+@@ -15818,14 +15822,14 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:15821: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:15825: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:15828: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:15832: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -15833,7 +15837,7 @@
+ 
+ : ${cf_nculib_root:=$cf_cv_screen}
+ as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
+-echo "$as_me:15836: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
++echo "$as_me:15840: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15841,7 +15845,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_nculib_root  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15844 "configure"
++#line 15848 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15860,16 +15864,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15863: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15867: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15866: \$? = $ac_status" >&5
++  echo "$as_me:15870: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15869: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15872: \$? = $ac_status" >&5
++  echo "$as_me:15876: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -15880,7 +15884,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15883: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:15887: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   cf_cv_ncurses_pthreads=yes
+@@ -15915,7 +15919,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15918: checking for X11 rgb file" >&5
++echo "$as_me:15922: checking for X11 rgb file" >&5
+ echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
+ 
+ # Check whether --with-x11-rgb or --without-x11-rgb was given.
+@@ -15979,7 +15983,7 @@
+ 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:15982: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:15986: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -15987,7 +15991,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15990: result: $RGB_PATH" >&5
++echo "$as_me:15994: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:16035: checking for desired basename for form library" >&5
+ echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
+ 
+ # Check whether --with-form-libname or --without-form-libname was given.
+@@ -16048,10 +16052,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16051: result: $FORM_NAME" >&5
++echo "$as_me:16055: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:16054: checking for desired basename for menu library" >&5
++echo "$as_me:16058: checking for desired basename for menu library" >&5
+ echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
+ 
+ # Check whether --with-menu-libname or --without-menu-libname was given.
+@@ -16071,10 +16075,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16074: result: $MENU_NAME" >&5
++echo "$as_me:16078: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:16077: checking for desired basename for panel library" >&5
++echo "$as_me:16081: checking for desired basename for panel library" >&5
+ echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
+ 
+ # Check whether --with-panel-libname or --without-panel-libname was given.
+@@ -16094,10 +16098,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16097: result: $PANEL_NAME" >&5
++echo "$as_me:16101: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:16100: checking if you want to check for panel functions" >&5
++echo "$as_me:16104: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -16114,7 +16118,7 @@
+ 	cf_enable_panel=$cf_default_panel
+ 
+ fi;
+-echo "$as_me:16117: result: $cf_enable_panel" >&5
++echo "$as_me:16121: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -16125,13 +16129,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:16128: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++	echo "$as_me:16132: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $PANEL_NAME$cf_cv_libtype ; then
+-		echo "$as_me:16131: result: yes" >&5
++		echo "$as_me:16135: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:16134: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:16138: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+@@ -16252,7 +16256,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16255 "configure"
++#line 16259 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -16264,37 +16268,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16267: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16271: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16270: \$? = $ac_status" >&5
++  echo "$as_me:16274: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16273: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16276: \$? = $ac_status" >&5
++  echo "$as_me:16280: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16282 "configure"
++#line 16286 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ 				int main(void)
+ 				{ (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16289: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16293: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16292: \$? = $ac_status" >&5
++  echo "$as_me:16296: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16294: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16297: \$? = $ac_status" >&5
++  echo "$as_me:16301: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -16311,7 +16315,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:16314: result: $cf_have_curses_lib" >&5
++		echo "$as_me:16318: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" != "yes"
+@@ -16331,7 +16335,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:16334: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:16338: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16339,7 +16343,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16342 "configure"
++#line 16346 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16358,16 +16362,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16361: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16365: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16364: \$? = $ac_status" >&5
++  echo "$as_me:16368: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16370: \$? = $ac_status" >&5
++  echo "$as_me:16374: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -16378,7 +16382,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16381: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:16385: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -16411,7 +16415,7 @@
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+-echo "$as_me:16414: checking if you want to check for menu functions" >&5
++echo "$as_me:16418: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -16428,7 +16432,7 @@
+ 	cf_enable_menu=$cf_default_menu
+ 
+ fi;
+-echo "$as_me:16431: result: $cf_enable_menu" >&5
++echo "$as_me:16435: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -16437,14 +16441,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:16440: checking for NetBSD menu.h" >&5
++echo "$as_me:16444: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16447 "configure"
++#line 16451 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -16462,16 +16466,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16469: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16468: \$? = $ac_status" >&5
++  echo "$as_me:16472: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16475: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16474: \$? = $ac_status" >&5
++  echo "$as_me:16478: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -16483,7 +16487,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16486: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:16490: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -16500,13 +16504,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:16503: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++	echo "$as_me:16507: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $MENU_NAME$cf_cv_libtype ; then
+-		echo "$as_me:16506: result: yes" >&5
++		echo "$as_me:16510: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:16509: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:16513: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+@@ -16627,7 +16631,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16630 "configure"
++#line 16634 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -16639,37 +16643,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16642: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16646: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16645: \$? = $ac_status" >&5
++  echo "$as_me:16649: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16651: \$? = $ac_status" >&5
++  echo "$as_me:16655: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16657 "configure"
++#line 16661 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ 				int main(void)
+ 				{ (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16664: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16668: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16667: \$? = $ac_status" >&5
++  echo "$as_me:16671: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:16669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16672: \$? = $ac_status" >&5
++  echo "$as_me:16676: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -16686,7 +16690,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:16689: result: $cf_have_curses_lib" >&5
++		echo "$as_me:16693: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" != "yes"
+@@ -16706,7 +16710,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:16709: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:16713: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16714,7 +16718,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16717 "configure"
++#line 16721 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16733,16 +16737,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16736: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16740: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16739: \$? = $ac_status" >&5
++  echo "$as_me:16743: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:16742: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16745: \$? = $ac_status" >&5
++  echo "$as_me:16749: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -16753,7 +16757,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16756: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:16760: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -16786,7 +16790,7 @@
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+-echo "$as_me:16789: checking if you want to check for form functions" >&5
++echo "$as_me:16793: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-form or --disable-form was given.
+@@ -16803,7 +16807,7 @@
+ 	cf_enable_form=$cf_default_form
+ 
+ fi;
+-echo "$as_me:16806: result: $cf_enable_form" >&5
++echo "$as_me:16810: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -16812,14 +16816,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:16815: checking for NetBSD form.h" >&5
++echo "$as_me:16819: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16822 "configure"
++#line 16826 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -16838,16 +16842,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16845: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16844: \$? = $ac_status" >&5
++  echo "$as_me:16848: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:16847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16851: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16850: \$? = $ac_status" >&5
++  echo "$as_me:16854: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -16859,7 +16863,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:16862: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:16866: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -16876,13 +16880,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:16879: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++	echo "$as_me:16883: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $FORM_NAME$cf_cv_libtype ; then
+-		echo "$as_me:16882: result: yes" >&5
++		echo "$as_me:16886: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:16885: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:16889: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CPPFLAGS="$CPPFLAGS"
+@@ -17003,7 +17007,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17006 "configure"
++#line 17010 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -17015,37 +17019,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17022: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17021: \$? = $ac_status" >&5
++  echo "$as_me:17025: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17027: \$? = $ac_status" >&5
++  echo "$as_me:17031: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17033 "configure"
++#line 17037 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ 				int main(void)
+ 				{ (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17040: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17043: \$? = $ac_status" >&5
++  echo "$as_me:17047: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17049: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17048: \$? = $ac_status" >&5
++  echo "$as_me:17052: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17062,7 +17066,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-		echo "$as_me:17065: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17069: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" != "yes"
+@@ -17082,7 +17086,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:17085: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:17089: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17090,7 +17094,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17093 "configure"
++#line 17097 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17109,16 +17113,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17112: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17115: \$? = $ac_status" >&5
++  echo "$as_me:17119: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17118: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17121: \$? = $ac_status" >&5
++  echo "$as_me:17125: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17129,7 +17133,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17132: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:17136: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ 
+@@ -17167,23 +17171,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17170: checking for $ac_header" >&5
++echo "$as_me:17174: 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 17176 "configure"
++#line 17180 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17180: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17184: \"$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:17186: \$? = $ac_status" >&5
++  echo "$as_me:17190: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17202,7 +17206,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17205: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17209: 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 <&5
++echo "$as_me:17219: 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 17221 "configure"
++#line 17225 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17226,13 +17230,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:17229: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17233: \"$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:17235: \$? = $ac_status" >&5
++  echo "$as_me:17239: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17254,7 +17258,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 17257 "configure"
++#line 17261 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17272,7 +17276,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 17275 "configure"
++#line 17279 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -17293,7 +17297,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 17296 "configure"
++#line 17300 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -17319,15 +17323,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17322: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17326: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17325: \$? = $ac_status" >&5
++  echo "$as_me:17329: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:17327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17330: \$? = $ac_status" >&5
++  echo "$as_me:17334: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -17340,7 +17344,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:17343: result: $ac_cv_header_stdc" >&5
++echo "$as_me:17347: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -17350,13 +17354,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17353: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17357: 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 17359 "configure"
++#line 17363 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17372,16 +17376,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17375: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17379: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17378: \$? = $ac_status" >&5
++  echo "$as_me:17382: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17381: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17384: \$? = $ac_status" >&5
++  echo "$as_me:17388: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17391,7 +17395,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17394: result: $ac_cv_header_time" >&5
++echo "$as_me:17398: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17415,23 +17419,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17418: checking for $ac_header" >&5
++echo "$as_me:17422: 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 17424 "configure"
++#line 17428 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17428: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17432: \"$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:17434: \$? = $ac_status" >&5
++  echo "$as_me:17438: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17450,7 +17454,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17453: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17457: 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 <&5
++echo "$as_me:17470: 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 17472 "configure"
++#line 17476 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17476: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17480: \"$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:17482: \$? = $ac_status" >&5
++  echo "$as_me:17486: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17498,7 +17502,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17501: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17505: 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 <&5
++echo "$as_me:17515: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17518,7 +17522,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17521 "configure"
++#line 17525 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -17531,16 +17535,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17534: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17538: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17537: \$? = $ac_status" >&5
++  echo "$as_me:17541: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17544: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17543: \$? = $ac_status" >&5
++  echo "$as_me:17547: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -17552,7 +17556,7 @@
+ done
+ 
+ fi
+-echo "$as_me:17555: result: $cf_cv_getopt_header" >&5
++echo "$as_me:17559: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+ 
+@@ -17577,13 +17581,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17580: checking for $ac_func" >&5
++echo "$as_me:17584: 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 17586 "configure"
++#line 17590 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17614,16 +17618,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17617: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17621: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17620: \$? = $ac_status" >&5
++  echo "$as_me:17624: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17623: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17626: \$? = $ac_status" >&5
++  echo "$as_me:17630: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17633,7 +17637,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17636: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:17640: 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 <&5
++echo "$as_me:17651: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17654 "configure"
++#line 17658 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17672,16 +17676,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17679: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17678: \$? = $ac_status" >&5
++  echo "$as_me:17682: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17685: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17684: \$? = $ac_status" >&5
++  echo "$as_me:17688: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -17691,7 +17695,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17694: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:17698: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -17701,14 +17705,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:17704: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:17708: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17711 "configure"
++#line 17715 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17729,16 +17733,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17732: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17736: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17735: \$? = $ac_status" >&5
++  echo "$as_me:17739: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17738: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17741: \$? = $ac_status" >&5
++  echo "$as_me:17745: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -17748,7 +17752,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17751: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:17755: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17758,7 +17762,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:17761: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:17765: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -17777,13 +17781,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17780: checking for $ac_func" >&5
++echo "$as_me:17784: 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 17786 "configure"
++#line 17790 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17814,16 +17818,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17817: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17821: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17820: \$? = $ac_status" >&5
++  echo "$as_me:17824: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17827: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17826: \$? = $ac_status" >&5
++  echo "$as_me:17830: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17833,7 +17837,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17836: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:17840: 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 <&5
++echo "$as_me:17852: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17853,7 +17857,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17856 "configure"
++#line 17860 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17873,22 +17877,29 @@
+ #endif
+ 	long x = winnstr(stdscr, "", 0);
+ 	int x1, y1;
+-	getbegyx(stdscr, y1, x1)
++#ifdef NCURSES_VERSION
++	(void)check2;
++#endif
++	getbegyx(stdscr, y1, x1);
++	(void)x;
++	(void)y1;
++	(void)x1;
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17882: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17893: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17885: \$? = $ac_status" >&5
++  echo "$as_me:17896: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17888: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17891: \$? = $ac_status" >&5
++  echo "$as_me:17902: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -17898,7 +17909,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 17901 "configure"
++#line 17912 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -17914,22 +17925,29 @@
+ #endif
+ 		long x = winnstr(stdscr, "", 0);
+ 		int x1, y1;
+-		getbegyx(stdscr, y1, x1)
++		getbegyx(stdscr, y1, x1);
++#ifdef NCURSES_VERSION
++		(void)check2;
++#endif
++		(void)x;
++		(void)y1;
++		(void)x1;
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17941: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17926: \$? = $ac_status" >&5
++  echo "$as_me:17944: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:17929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17932: \$? = $ac_status" >&5
++  echo "$as_me:17950: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -17943,7 +17961,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:17946: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:17964: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case $cf_cv_need_xopen_extension in
+@@ -17955,7 +17973,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17958: checking for term.h" >&5
++echo "$as_me:17976: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17976,7 +17994,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 17979 "configure"
++#line 17997 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17984,22 +18002,22 @@
+ int
+ main (void)
+ {
+-WINDOW *x
++WINDOW *x; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18011: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17996: \$? = $ac_status" >&5
++  echo "$as_me:18014: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:17999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18002: \$? = $ac_status" >&5
++  echo "$as_me:18020: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -18018,7 +18036,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18021 "configure"
++#line 18039 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18030,22 +18048,22 @@
+ int
+ main (void)
+ {
+-WINDOW *x
++WINDOW *x; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18039: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18057: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18042: \$? = $ac_status" >&5
++  echo "$as_me:18060: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18063: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18048: \$? = $ac_status" >&5
++  echo "$as_me:18066: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -18060,7 +18078,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:18063: result: $cf_cv_term_header" >&5
++echo "$as_me:18081: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case $cf_cv_term_header in
+@@ -18087,7 +18105,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18090: checking for unctrl.h" >&5
++echo "$as_me:18108: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18108,7 +18126,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18111 "configure"
++#line 18129 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18116,22 +18134,22 @@
+ int
+ main (void)
+ {
+-WINDOW *x
++WINDOW *x; (void)x
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18125: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18143: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18128: \$? = $ac_status" >&5
++  echo "$as_me:18146: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18134: \$? = $ac_status" >&5
++  echo "$as_me:18152: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -18144,12 +18162,12 @@
+ done
+ 
+ fi
+-echo "$as_me:18147: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:18165: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case $cf_cv_unctrl_header in
+ (no)
+-	{ echo "$as_me:18152: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:18170: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -18238,10 +18256,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:18241: checking for ${cf_func}" >&5
++	echo "$as_me:18259: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:18244: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:18262: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18250,7 +18268,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 18253 "configure"
++#line 18271 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -18283,16 +18301,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18286: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18304: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18289: \$? = $ac_status" >&5
++  echo "$as_me:18307: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18310: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18295: \$? = $ac_status" >&5
++  echo "$as_me:18313: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -18308,7 +18326,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:18311: result: $cf_result" >&5
++	echo "$as_me:18329: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:18344: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:18329: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:18347: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18335,7 +18353,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 18338 "configure"
++#line 18356 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -18368,16 +18386,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18371: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18389: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18374: \$? = $ac_status" >&5
++  echo "$as_me:18392: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18377: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18380: \$? = $ac_status" >&5
++  echo "$as_me:18398: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -18393,7 +18411,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:18396: result: $cf_result" >&5
++	echo "$as_me:18414: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result != no; then
+ 		cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
+-#line 18420 "configure"
++#line 18438 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18437,21 +18455,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18440: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18458: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18443: \$? = $ac_status" >&5
++  echo "$as_me:18461: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18446: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18464: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18449: \$? = $ac_status" >&5
++  echo "$as_me:18467: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:18454: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:18472: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:18492: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18481 "configure"
++#line 18499 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18493,16 +18511,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18496: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18514: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18499: \$? = $ac_status" >&5
++  echo "$as_me:18517: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18502: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18520: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18505: \$? = $ac_status" >&5
++  echo "$as_me:18523: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -18510,7 +18528,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18513 "configure"
++#line 18531 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18535,16 +18553,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18538: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18556: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18541: \$? = $ac_status" >&5
++  echo "$as_me:18559: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18544: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18562: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18547: \$? = $ac_status" >&5
++  echo "$as_me:18565: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -18558,7 +18576,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18561: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:18579: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -18572,11 +18590,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:18575: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:18593: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 18579 "configure"
++#line 18597 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18589,16 +18607,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18592: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18610: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18595: \$? = $ac_status" >&5
++  echo "$as_me:18613: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18616: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18601: \$? = $ac_status" >&5
++  echo "$as_me:18619: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -18607,7 +18625,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >conftest.$ac_ext <<_ACEOF
+-#line 18610 "configure"
++#line 18628 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18620,16 +18638,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18623: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18641: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18626: \$? = $ac_status" >&5
++  echo "$as_me:18644: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18632: \$? = $ac_status" >&5
++  echo "$as_me:18650: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -18640,7 +18658,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-		echo "$as_me:18643: result: $cf_define_xpg5" >&5
++		echo "$as_me:18661: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -18649,14 +18667,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:18652: checking for wide-character functions" >&5
++	echo "$as_me:18670: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18659 "configure"
++#line 18677 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18673,16 +18691,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18676: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18694: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18679: \$? = $ac_status" >&5
++  echo "$as_me:18697: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18685: \$? = $ac_status" >&5
++  echo "$as_me:18703: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -18693,7 +18711,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18696: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:18714: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -18714,14 +18732,14 @@
+ 
+ fi
+ 
+-echo "$as_me:18717: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:18735: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18724 "configure"
++#line 18742 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18739,16 +18757,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18742: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18760: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18745: \$? = $ac_status" >&5
++  echo "$as_me:18763: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18748: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18766: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18751: \$? = $ac_status" >&5
++  echo "$as_me:18769: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -18759,21 +18777,21 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:18762: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:18780: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:18769: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:18787: 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 18776 "configure"
++#line 18794 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18793,16 +18811,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18796: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18814: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18799: \$? = $ac_status" >&5
++  echo "$as_me:18817: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:18802: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18820: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18805: \$? = $ac_status" >&5
++  echo "$as_me:18823: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -18814,7 +18832,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18817: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:18835: 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
+@@ -18823,7 +18841,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:18826: checking for openpty in -lutil" >&5
++echo "$as_me:18844: 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
+@@ -18831,7 +18849,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18834 "configure"
++#line 18852 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18850,16 +18868,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18871: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18856: \$? = $ac_status" >&5
++  echo "$as_me:18874: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18877: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18862: \$? = $ac_status" >&5
++  echo "$as_me:18880: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -18870,7 +18888,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18873: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:18891: 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
+@@ -18878,7 +18896,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:18881: checking for openpty header" >&5
++echo "$as_me:18899: 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
+@@ -18905,7 +18923,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 18908 "configure"
++#line 18926 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18922,16 +18940,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18925: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18943: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18928: \$? = $ac_status" >&5
++  echo "$as_me:18946: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:18931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18949: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18934: \$? = $ac_status" >&5
++  echo "$as_me:18952: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -18949,7 +18967,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:18952: result: $cf_cv_func_openpty" >&5
++echo "$as_me:18970: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -18983,7 +19001,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18986: checking for function curses_version" >&5
++echo "$as_me:19004: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18993,7 +19011,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 18996 "configure"
++#line 19014 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19006,15 +19024,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19009: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19027: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19012: \$? = $ac_status" >&5
++  echo "$as_me:19030: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19014: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19032: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19017: \$? = $ac_status" >&5
++  echo "$as_me:19035: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -19029,14 +19047,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:19032: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:19050: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:19039: checking for alternate character set array" >&5
++echo "$as_me:19057: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19046,7 +19064,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19049 "configure"
++#line 19067 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19062,16 +19080,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19065: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19083: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19068: \$? = $ac_status" >&5
++  echo "$as_me:19086: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19089: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19074: \$? = $ac_status" >&5
++  echo "$as_me:19092: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -19082,7 +19100,7 @@
+ done
+ 
+ fi
+-echo "$as_me:19085: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:19103: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -19092,7 +19110,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:19095: checking for wide alternate character set array" >&5
++echo "$as_me:19113: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19102,7 +19120,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19105 "configure"
++#line 19123 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19112,22 +19130,22 @@
+ int
+ main (void)
+ {
+-void *foo = &($name['k'])
++void *foo = &($name['k']); (void)foo
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19121: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19139: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19124: \$? = $ac_status" >&5
++  echo "$as_me:19142: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19145: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19130: \$? = $ac_status" >&5
++  echo "$as_me:19148: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -19138,7 +19156,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	done
+ fi
+-echo "$as_me:19141: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:19159: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -19146,7 +19164,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:19149: checking for wide alternate character constants" >&5
++echo "$as_me:19167: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19156,7 +19174,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19159 "configure"
++#line 19177 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19167,22 +19185,22 @@
+ main (void)
+ {
+ cchar_t *foo = WACS_PLUS;
+-	 $cf_cv_curses_wacs_map['k'] = *WACS_PLUS
++	 $cf_cv_curses_wacs_map['k'] = *WACS_PLUS; (void)foo
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19176: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19194: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19179: \$? = $ac_status" >&5
++  echo "$as_me:19197: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19200: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19185: \$? = $ac_status" >&5
++  echo "$as_me:19203: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -19192,7 +19210,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ else
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19195 "configure"
++#line 19213 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19202,22 +19220,22 @@
+ int
+ main (void)
+ {
+-cchar_t *foo = WACS_PLUS
++cchar_t *foo = WACS_PLUS; (void)foo
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19211: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19229: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19214: \$? = $ac_status" >&5
++  echo "$as_me:19232: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19235: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19220: \$? = $ac_status" >&5
++  echo "$as_me:19238: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -19228,7 +19246,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:19231: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:19249: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -19238,10 +19256,10 @@
+ 
+ fi
+ 
+-echo "$as_me:19241: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19259: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19244 "configure"
++#line 19262 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19259,16 +19277,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19262: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19280: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19265: \$? = $ac_status" >&5
++  echo "$as_me:19283: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19286: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19271: \$? = $ac_status" >&5
++  echo "$as_me:19289: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19277,7 +19295,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19280: result: $cf_result" >&5
++echo "$as_me:19298: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19298,14 +19316,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:19301: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:19319: 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 19308 "configure"
++#line 19326 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19323,23 +19341,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19326: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19344: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19329: \$? = $ac_status" >&5
++  echo "$as_me:19347: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19332: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19350: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19335: \$? = $ac_status" >&5
++  echo "$as_me:19353: \$? = $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 19342 "configure"
++#line 19360 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19358,16 +19376,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19361: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19379: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19364: \$? = $ac_status" >&5
++  echo "$as_me:19382: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19370: \$? = $ac_status" >&5
++  echo "$as_me:19388: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -19379,7 +19397,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:19382: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:19400: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -19402,14 +19420,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:19405: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:19423: 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 19412 "configure"
++#line 19430 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19427,23 +19445,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19430: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19448: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19433: \$? = $ac_status" >&5
++  echo "$as_me:19451: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19436: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19454: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19439: \$? = $ac_status" >&5
++  echo "$as_me:19457: \$? = $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 19446 "configure"
++#line 19464 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19462,16 +19480,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19483: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19468: \$? = $ac_status" >&5
++  echo "$as_me:19486: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19474: \$? = $ac_status" >&5
++  echo "$as_me:19492: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -19483,7 +19501,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:19486: result: $cf_cv_wchar_t" >&5
++echo "$as_me:19504: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -19506,14 +19524,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:19509: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:19527: 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 19516 "configure"
++#line 19534 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19531,23 +19549,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19534: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19552: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19537: \$? = $ac_status" >&5
++  echo "$as_me:19555: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19558: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19543: \$? = $ac_status" >&5
++  echo "$as_me:19561: \$? = $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 19550 "configure"
++#line 19568 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19566,16 +19584,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19587: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19572: \$? = $ac_status" >&5
++  echo "$as_me:19590: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19593: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19578: \$? = $ac_status" >&5
++  echo "$as_me:19596: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -19587,7 +19605,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:19590: result: $cf_cv_wint_t" >&5
++echo "$as_me:19608: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -19611,10 +19629,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:19614: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19632: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19617 "configure"
++#line 19635 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19632,16 +19650,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19635: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19653: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19638: \$? = $ac_status" >&5
++  echo "$as_me:19656: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19641: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19659: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19644: \$? = $ac_status" >&5
++  echo "$as_me:19662: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19650,7 +19668,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19653: result: $cf_result" >&5
++echo "$as_me:19671: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19672,10 +19690,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:19675: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19693: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19678 "configure"
++#line 19696 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19693,16 +19711,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19696: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19714: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19699: \$? = $ac_status" >&5
++  echo "$as_me:19717: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19702: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19705: \$? = $ac_status" >&5
++  echo "$as_me:19723: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19711,7 +19729,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19714: result: $cf_result" >&5
++echo "$as_me:19732: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19733,10 +19751,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:19736: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19754: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19739 "configure"
++#line 19757 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -19754,16 +19772,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19757: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19775: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19760: \$? = $ac_status" >&5
++  echo "$as_me:19778: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19763: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19781: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19766: \$? = $ac_status" >&5
++  echo "$as_me:19784: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19772,7 +19790,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19775: result: $cf_result" >&5
++echo "$as_me:19793: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -19801,11 +19819,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:19804: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:19822: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19808 "configure"
++#line 19826 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19838,16 +19856,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19859: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19844: \$? = $ac_status" >&5
++  echo "$as_me:19862: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:19847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19850: \$? = $ac_status" >&5
++  echo "$as_me:19868: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ 
+@@ -19857,7 +19875,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:19860: result: $cf_result" >&5
++echo "$as_me:19878: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test $cf_result = yes ; then
+@@ -19869,14 +19887,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:19872: checking for data $cf_data in library" >&5
++	echo "$as_me:19890: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 19879 "configure"
++#line 19897 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19915,16 +19933,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19921: \$? = $ac_status" >&5
++  echo "$as_me:19939: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:19924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19927: \$? = $ac_status" >&5
++  echo "$as_me:19945: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -19936,7 +19954,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 19939 "configure"
++#line 19957 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19968,15 +19986,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:19971: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19989: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19974: \$? = $ac_status" >&5
++  echo "$as_me:19992: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:19976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19979: \$? = $ac_status" >&5
++  echo "$as_me:19997: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ 
+@@ -19988,7 +20006,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-	echo "$as_me:19991: result: $cf_result" >&5
++	echo "$as_me:20009: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result = yes ; then
+ 
+@@ -20005,7 +20023,7 @@
+ 
+ if ( test "$GCC" = yes || test "$GXX" = yes )
+ then
+-echo "$as_me:20008: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:20026: checking if you want to turn on gcc warnings" >&5
+ echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -20022,7 +20040,7 @@
+ 	with_warnings=no
+ 
+ fi;
+-echo "$as_me:20025: result: $with_warnings" >&5
++echo "$as_me:20043: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ if test "$with_warnings" = "yes"
+ then
+@@ -20045,10 +20063,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:20048: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:20066: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <&5
++		if { (eval echo "$as_me:20118: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20103: \$? = $ac_status" >&5
++  echo "$as_me:20121: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:20105: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:20123: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in
+@@ -20180,7 +20198,7 @@
+ done
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20183 "configure"
++#line 20201 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20189,32 +20207,32 @@
+ int
+ main (void)
+ {
+-String foo = malloc(1)
++String foo = malloc(1); (void)foo
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20198: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20216: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20201: \$? = $ac_status" >&5
++  echo "$as_me:20219: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20222: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20207: \$? = $ac_status" >&5
++  echo "$as_me:20225: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-echo "$as_me:20210: checking for X11/Xt const-feature" >&5
++echo "$as_me:20228: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 20217 "configure"
++#line 20235 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -20231,16 +20249,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20252: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20237: \$? = $ac_status" >&5
++  echo "$as_me:20255: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:20240: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20243: \$? = $ac_status" >&5
++  echo "$as_me:20261: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -20255,7 +20273,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:20258: result: $cf_cv_const_x_string" >&5
++echo "$as_me:20276: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -20284,7 +20302,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+  fi
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:20321: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -20316,12 +20334,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:20319: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:20337: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20322: \$? = $ac_status" >&5
++  echo "$as_me:20340: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:20324: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:20342: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -20329,7 +20347,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:20332: checking for $CC warning options..." >&5
++	{ echo "$as_me:20350: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -20353,12 +20371,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:20356: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:20374: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20359: \$? = $ac_status" >&5
++  echo "$as_me:20377: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:20361: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:20379: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in
+ 			(Winline)
+@@ -20366,7 +20384,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:20369: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:20387: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -20376,7 +20394,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:20379: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:20397: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -20392,7 +20410,7 @@
+ fi
+ fi
+ 
+-echo "$as_me:20395: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:20413: 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.
+@@ -20409,7 +20427,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:20412: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:20430: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -20523,23 +20541,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:20526: checking for dmalloc.h" >&5
++	echo "$as_me:20544: 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 20532 "configure"
++#line 20550 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20536: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20554: \"$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:20542: \$? = $ac_status" >&5
++  echo "$as_me:20560: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20558,11 +20576,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20561: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:20579: 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:20565: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:20583: 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
+@@ -20570,7 +20588,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20573 "configure"
++#line 20591 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20589,16 +20607,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20592: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20610: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20595: \$? = $ac_status" >&5
++  echo "$as_me:20613: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20616: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20601: \$? = $ac_status" >&5
++  echo "$as_me:20619: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -20609,7 +20627,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20612: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:20630: 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 <&5
++echo "$as_me:20645: 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.
+@@ -20641,7 +20659,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:20644: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:20662: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -20755,23 +20773,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:20758: checking for dbmalloc.h" >&5
++	echo "$as_me:20776: 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 20764 "configure"
++#line 20782 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:20768: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20786: \"$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:20774: \$? = $ac_status" >&5
++  echo "$as_me:20792: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20790,11 +20808,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20793: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:20811: 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:20797: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:20815: 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
+@@ -20802,7 +20820,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20805 "configure"
++#line 20823 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20821,16 +20839,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:20824: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20842: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20827: \$? = $ac_status" >&5
++  echo "$as_me:20845: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:20830: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20833: \$? = $ac_status" >&5
++  echo "$as_me:20851: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -20841,7 +20859,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20844: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:20862: 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 <&5
++echo "$as_me:20877: 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.
+@@ -20873,7 +20891,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:20876: result: ${with_valgrind:-no}" >&5
++echo "$as_me:20894: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in
+@@ -20986,7 +21004,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:20989: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:21007: 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.
+@@ -20996,7 +21014,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:20999: result: $with_no_leaks" >&5
++echo "$as_me:21017: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -21014,7 +21032,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:21017: checking for an rpath option" >&5
++	echo "$as_me:21035: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case $cf_cv_system_name in
+ 	(irix*)
+@@ -21045,12 +21063,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:21048: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:21066: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:21053: checking if we need a space after rpath option" >&5
++		echo "$as_me:21071: 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"
+ 
+@@ -21071,7 +21089,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 21074 "configure"
++#line 21092 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21083,16 +21101,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21086: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21104: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21089: \$? = $ac_status" >&5
++  echo "$as_me:21107: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21092: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21110: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21095: \$? = $ac_status" >&5
++  echo "$as_me:21113: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_space=no
+ else
+@@ -21102,14 +21120,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:21105: result: $cf_rpath_space" >&5
++		echo "$as_me:21123: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:21112: checking if rpath-hack should be disabled" >&5
++echo "$as_me:21130: checking if rpath-hack should be disabled" >&5
+ echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+@@ -21126,21 +21144,21 @@
+ 	cf_disable_rpath_hack=no
+ 
+ fi;
+-echo "$as_me:21129: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:21147: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ if test "$cf_disable_rpath_hack" = no ; then
+ 
+-echo "$as_me:21133: checking for updated LDFLAGS" >&5
++echo "$as_me:21151: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LD_RPATH_OPT" ; then
+-	echo "$as_me:21136: result: maybe" >&5
++	echo "$as_me:21154: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+ 
+ 	for ac_prog in ldd
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:21143: checking for $ac_word" >&5
++echo "$as_me:21161: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21155,7 +21173,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_cf_ldd_prog="$ac_prog"
+-echo "$as_me:21158: found $ac_dir/$ac_word" >&5
++echo "$as_me:21176: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -21163,10 +21181,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:21166: result: $cf_ldd_prog" >&5
++  echo "$as_me:21184: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:21169: result: no" >&5
++  echo "$as_me:21187: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -21180,7 +21198,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21183 "configure"
++#line 21201 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21192,16 +21210,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21195: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21213: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21198: \$? = $ac_status" >&5
++  echo "$as_me:21216: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:21201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21219: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21204: \$? = $ac_status" >&5
++  echo "$as_me:21222: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -21229,7 +21247,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:21232: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:21250: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -21241,11 +21259,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21244: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21262: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21248: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21266: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -21282,7 +21300,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:21285: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:21303: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -21295,11 +21313,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21298: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21316: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:21302: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:21320: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -21336,7 +21354,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:21339: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:21357: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -21349,14 +21367,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:21352: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:21370: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21356: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:21374: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:21359: result: no" >&5
++	echo "$as_me:21377: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -21446,7 +21464,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:21449: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:21467: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -21622,7 +21640,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:21625: error: ambiguous option: $1
++    { { echo "$as_me:21643: 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;}
+@@ -21641,7 +21659,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:21644: error: unrecognized option: $1
++  -*) { { echo "$as_me:21662: 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;}
+@@ -21691,7 +21709,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
+-  *) { { echo "$as_me:21694: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:21712: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -21990,7 +22008,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:21993: creating $ac_file" >&5
++    { echo "$as_me:22011: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -22008,7 +22026,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:22011: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:22029: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -22021,7 +22039,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:22024: error: cannot find input file: $f" >&5
++           { { echo "$as_me:22042: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -22037,7 +22055,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' $ac_item`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:22040: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:22058: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -22046,7 +22064,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' $ac_item`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:22049: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:22067: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -22083,7 +22101,7 @@
+             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:22086: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:22104: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -22094,7 +22112,7 @@
+     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:22097: WARNING: Some variables may not be substituted:
++      { echo "$as_me:22115: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -22143,7 +22161,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:22146: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:22164: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -22154,7 +22172,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:22157: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:22175: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -22167,7 +22185,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:22170: error: cannot find input file: $f" >&5
++           { { echo "$as_me:22188: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -22225,7 +22243,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:22228: $ac_file is unchanged" >&5
++      { echo "$as_me:22246: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/demo_forms.c
+Prereq:  1.57 
+--- ncurses-6.2-20200314+/test/demo_forms.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200321/test/demo_forms.c	2020-03-21 15:57:59.000000000 +0000
+@@ -27,41 +27,11 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_forms.c,v 1.57 2020/02/02 23:34:34 tom Exp $
++ * $Id: demo_forms.c,v 1.58 2020/03/21 15:57:59 tom Exp $
+  *
+  * Demonstrate a variety of functions from the form library.
+  * Thomas Dickey - 2003/4/26
+  */
+-/*
+-dup_field			-
+-field_init			-
+-field_just			-
+-field_term			-
+-form_init			-
+-form_opts			-
+-form_opts_off			-
+-form_opts_on			-
+-form_request_by_name		-
+-form_term			-
+-form_userptr			-
+-free_fieldtype			-
+-link_field			-
+-link_fieldtype			-
+-move_field			-
+-new_page			-
+-pos_form_cursor			-
+-set_field_init			-
+-set_field_term			-
+-set_fieldtype_arg		-
+-set_fieldtype_choice		-
+-set_form_fields			-
+-set_form_init			-
+-set_form_opts			-
+-set_form_page			-
+-set_form_term			-
+-set_form_userptr		-
+-set_max_field			-
+-*/
+ 
+ #include 
+ 
+Index: test/dup_field.c
+--- /dev/null	2020-03-21 08:04:14.468000000 +0000
++++ ncurses-6.2-20200321/test/dup_field.c	2020-03-21 19:28:36.000000000 +0000
+@@ -0,0 +1,394 @@
++/****************************************************************************
++ * Copyright 2020 Thomas E. Dickey                                          *
++ *                                                                          *
++ * 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: dup_field.c,v 1.1 2020/03/21 19:28:36 tom Exp $
++ *
++ * Demonstrate move_field().
++ */
++
++#include 
++
++#if USE_LIBFORM
++
++#include 
++#include 
++
++#define MY_DEMO		EDIT_FIELD('f')
++
++static char empty[] = "";
++static FIELD *all_fields[100];
++
++/* *INDENT-OFF* */
++static struct {
++    int code;
++    int result;
++    const char *help;
++} commands[] = {
++    { CTRL('A'),     REQ_BEG_FIELD,   "go to beginning of field" },
++    { CTRL('D'),     REQ_DOWN_FIELD,  "move downward to field" },
++    { CTRL('E'),     REQ_END_FIELD,   "go to end of field" },
++    { CTRL('G'),     MY_DEMO,         "move current field with cursor keys" },
++    { CTRL('H'),     REQ_DEL_PREV,    "delete previous character" },
++    { CTRL('I'),     REQ_NEXT_FIELD,  "go to next field" },
++    { CTRL('K'),     REQ_CLR_EOF,     "clear to end of field" },
++    { CTRL('N'),     REQ_NEXT_FIELD,  "go to next field" },
++    { CTRL('P'),     REQ_PREV_FIELD,  "go to previous field" },
++    { CTRL('Q'),     MY_QUIT,         "exit form" },
++    { CTRL('U'),     REQ_UP_FIELD,    "move upward to field" },
++    { CTRL('W'),     REQ_NEXT_WORD,   "go to next word" },
++    { CTRL('X'),     REQ_CLR_FIELD,   "clear field" },
++    { CTRL('['),     MY_QUIT,         "exit form" },
++    { KEY_F(1),      MY_HELP,         "show this screen", },
++    { KEY_BACKSPACE, REQ_DEL_PREV,    "delete previous character" },
++    { KEY_BTAB,      REQ_PREV_FIELD,  "go to previous field" },
++    { KEY_DOWN,      REQ_DOWN_CHAR,   "move down 1 character" },
++    { KEY_END,       REQ_LAST_FIELD,  "go to last field" },
++    { KEY_HOME,      REQ_FIRST_FIELD, "go to first field" },
++    { KEY_LEFT,      REQ_LEFT_CHAR,   "move left 1 character" },
++    { KEY_NEXT,      REQ_NEXT_FIELD,  "go to next field" },
++    { KEY_PREVIOUS,  REQ_PREV_FIELD,  "go to previous field" },
++    { KEY_RIGHT,     REQ_RIGHT_CHAR,  "move right 1 character" },
++    { KEY_UP,        REQ_UP_CHAR,     "move up 1 character" }
++};
++/* *INDENT-ON* */
++
++static void
++my_help_edit_field(void)
++{
++    int used = 0;
++    unsigned n;
++    char **msgs = typeCalloc(char *, 3 + SIZEOF(commands));
++
++    msgs[used++] = strdup("Defined form edit/traversal keys:");
++    for (n = 0; n < SIZEOF(commands); ++n) {
++	char *msg;
++	const char *name;
++	const char *code = keyname(commands[n].code);
++	size_t need = 5;
++#ifdef NCURSES_VERSION
++	if ((name = form_request_name(commands[n].result)) == 0)
++#endif
++	    name = commands[n].help;
++	need = 5 + strlen(code) + strlen(name);
++	msg = typeMalloc(char, need);
++	_nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
++	msgs[used++] = msg;
++    }
++    msgs[used++] =
++	strdup("Arrow keys move within a field as you would expect.");
++    msgs[used] = 0;
++    popup_msg2(stdscr, msgs);
++    for (n = 0; msgs[n] != 0; ++n) {
++	free(msgs[n]);
++    }
++    free(msgs);
++}
++
++static void
++do_demo(FORM *form)
++{
++}
++
++static FIELD *
++make_label(const char *label, int frow, int fcol)
++{
++    FIELD *f = new_field(1, (int) strlen(label), frow, fcol, 0, 0);
++
++    if (f) {
++	set_field_buffer(f, 0, label);
++	set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE));
++    }
++    return (f);
++}
++
++static FIELD *
++make_field(int frow, int fcol, int rows, int cols)
++{
++    FIELD *f = new_field(rows, cols, frow, fcol, 0, 1);
++
++    if (f) {
++	set_field_back(f, A_UNDERLINE);
++	init_edit_field(f, empty);
++    }
++    return (f);
++}
++
++static void
++erase_form(FORM *f)
++{
++    WINDOW *w = form_win(f);
++    WINDOW *s = form_sub(f);
++
++    unpost_form(f);
++    werase(w);
++    wrefresh(w);
++    delwin(s);
++    delwin(w);
++}
++
++static int
++my_form_driver(FORM *form, int c)
++{
++    switch (c) {
++    case MY_QUIT:
++	if (form_driver(form, REQ_VALIDATION) == E_OK)
++	    return (TRUE);
++	break;
++    case MY_HELP:
++	my_help_edit_field();
++	break;
++    case MY_DEMO:
++	do_demo(form);
++	break;
++    default:
++	beep();
++	break;
++    }
++    return (FALSE);
++}
++
++static FieldAttrs *
++my_field_attrs(FIELD *f)
++{
++    return (FieldAttrs *) field_userptr(f);
++}
++
++static int
++buffer_length(FIELD *f)
++{
++    return my_field_attrs(f)->row_lengths[0];
++}
++
++static void
++set_buffer_length(FIELD *f, int length)
++{
++    my_field_attrs(f)->row_lengths[0] = length;
++}
++
++static int
++offset_in_field(FORM *form)
++{
++    FIELD *field = current_field(form);
++    int currow, curcol;
++
++    form_getyx(form, currow, curcol);
++    return curcol + currow * (int) field->dcols;
++}
++
++static void
++inactive_field(FIELD *f)
++{
++    set_field_back(f, my_field_attrs(f)->background);
++}
++
++static int
++my_edit_field(FORM *form, int *result)
++{
++    int ch = wgetch(form_win(form));
++    int status;
++    FIELD *before;
++    unsigned n;
++    int length;
++    int before_row;
++    int before_col;
++    int before_off = offset_in_field(form);
++
++    form_getyx(form, before_row, before_col);
++    before = current_field(form);
++    set_field_back(before, A_NORMAL);
++    if (ch <= KEY_MAX) {
++	set_field_back(before, A_REVERSE);
++    } else if (ch <= MAX_FORM_COMMAND) {
++	inactive_field(before);
++    }
++
++    *result = ch;
++    for (n = 0; n < SIZEOF(commands); ++n) {
++	if (commands[n].code == ch) {
++	    *result = commands[n].result;
++	    break;
++	}
++    }
++
++    status = form_driver(form, *result);
++
++    if (status == E_OK) {
++	bool modified = TRUE;
++
++	length = buffer_length(before);
++	if (length < before_off)
++	    length = before_off;
++	switch (*result) {
++	case REQ_CLR_EOF:
++	    length = before_off;
++	    break;
++	case REQ_CLR_EOL:
++	    if ((int) (before_row + 1) == (int) (before->rows))
++		length = before_off;
++	    break;
++	case REQ_CLR_FIELD:
++	    length = 0;
++	    break;
++	case REQ_DEL_CHAR:
++	    if (length > before_off)
++		--length;
++	    break;
++	case REQ_DEL_PREV:
++	    if (length > 0) {
++		if (before_col > 0) {
++		    --length;
++		} else if (before_row > 0) {
++		    length -= (int) before->cols + before_col;
++		}
++	    }
++	    break;
++	case REQ_NEW_LINE:
++	    length += (int) before->cols;
++	    break;
++
++	default:
++	    modified = (ch < MIN_FORM_COMMAND
++			&& isprint(ch));
++	    break;
++	}
++
++	/*
++	 * If we do not force a re-validation, then field_buffer 0 will
++	 * be lagging by one character.
++	 */
++	if (modified && form_driver(form, REQ_VALIDATION) == E_OK && *result
++	    < MIN_FORM_COMMAND)
++	    ++length;
++
++	set_buffer_length(before, length);
++    }
++
++    if (current_field(form) != before)
++	inactive_field(before);
++    return status;
++}
++
++static void
++demo_forms(void)
++{
++    FORM *form;
++    int c;
++    unsigned n = 0;
++    const char *fname;
++
++    /* describe the form */
++    all_fields[n++] = make_label("Sample Form", 0, 15);
++
++    fname = "Last Name";
++    all_fields[n++] = make_label(fname, 2, 0);
++    all_fields[n++] = make_field(3, 0, 1, 18);
++    set_field_type(all_fields[n - 1], TYPE_ALPHA, 1);
++
++    fname = "First Name";
++    all_fields[n++] = make_label(fname, 2, 20);
++    all_fields[n++] = make_field(3, 20, 1, 12);
++    set_field_type(all_fields[n - 1], TYPE_ALPHA, 1);
++
++    fname = "Middle Name";
++    all_fields[n++] = make_label(fname, 2, 34);
++    all_fields[n++] = make_field(3, 34, 1, 12);
++    set_field_type(all_fields[n - 1], TYPE_ALPHA, 1);
++
++    fname = "Comments";
++    all_fields[n++] = make_label(fname, 5, 0);
++    all_fields[n++] = make_field(6, 0, 4, 46);
++    init_edit_field(all_fields[n - 1], empty);
++
++    all_fields[n] = (FIELD *) 0;
++
++    if ((form = new_form(all_fields)) != 0) {
++	int finished = 0;
++
++	post_form(form);
++
++	while (!finished) {
++	    switch (my_edit_field(form, &c)) {
++	    case E_OK:
++		break;
++	    case E_UNKNOWN_COMMAND:
++		finished = my_form_driver(form, c);
++		break;
++	    default:
++		beep();
++		break;
++	    }
++	}
++
++	erase_form(form);
++
++	free_form(form);
++    }
++    for (c = 0; all_fields[c] != 0; c++) {
++	free_edit_field(all_fields[c]);
++	free_field(all_fields[c]);
++    }
++    noraw();
++    nl();
++}
++
++int
++main(void)
++{
++    setlocale(LC_ALL, "");
++
++    initscr();
++    cbreak();
++    noecho();
++    raw();
++    nonl();			/* lets us read ^M's */
++    intrflush(stdscr, FALSE);
++    keypad(stdscr, TRUE);
++
++    if (has_colors()) {
++	start_color();
++	init_pair(1, COLOR_WHITE, COLOR_BLUE);
++	init_pair(2, COLOR_GREEN, COLOR_BLACK);
++	init_pair(3, COLOR_CYAN, COLOR_BLACK);
++	bkgd((chtype) COLOR_PAIR(1));
++	refresh();
++    }
++
++    demo_forms();
++
++    endwin();
++    ExitProgram(EXIT_SUCCESS);
++}
++
++#else
++int
++main(void)
++{
++    printf("This program requires the curses form library\n");
++    ExitProgram(EXIT_FAILURE);
++}
++#endif
+Index: test/modules
+Prereq:  1.71 
+--- ncurses-6.2-20200314+/test/modules	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200321/test/modules	2020-03-21 16:09:48.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: modules,v 1.71 2020/02/02 23:34:34 tom Exp $
++# $Id: modules,v 1.72 2020/03/21 16:09:48 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
+@@ -36,7 +36,7 @@
+ background	progs		$(srcdir)	$(HEADER_DEPS)
+ blue		progs		$(srcdir)	$(HEADER_DEPS)
+ bs		progs		$(srcdir)	$(HEADER_DEPS)
+-cardfile	progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h ../include/form.h
++cardfile	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/panel.h $(incdir)/form.h
+ chgat		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+ clip_printw	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+ color_content	progs		$(srcdir)	$(HEADER_DEPS)
+@@ -45,9 +45,9 @@
+ demo_defkey	progs		$(srcdir)	$(HEADER_DEPS)
+ demo_forms	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
+ demo_keyok	progs		$(srcdir)	$(HEADER_DEPS)
+-demo_menus	progs		$(srcdir)	$(HEADER_DEPS)	../include/menu.h
++demo_menus	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/menu.h
+ demo_new_pair	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+-demo_panels	progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h
++demo_panels	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/panel.h
+ demo_tabs	progs		$(srcdir)	$(HEADER_DEPS)
+ demo_termcap	progs		$(srcdir)	$(HEADER_DEPS)
+ demo_terminfo	progs		$(srcdir)	$(HEADER_DEPS)
+@@ -58,6 +58,7 @@
+ dots_termcap	progs		$(srcdir)	$(HEADER_DEPS)
+ dots_xcurses	progs		$(srcdir)	$(HEADER_DEPS)
+ dump_window	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/dump_window.h
++dup_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
+ echochar	progs		$(srcdir)	$(HEADER_DEPS)
+ edit_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h	$(srcdir)/popup_msg.h
+ extended_color	progs		$(srcdir)	$(HEADER_DEPS)
+@@ -79,8 +80,9 @@
+ knight		progs		$(srcdir)	$(HEADER_DEPS)
+ list_keys	progs		$(srcdir)	$(HEADER_DEPS)
+ lrtest		progs		$(srcdir)	$(HEADER_DEPS)
++move_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
+ movewindow	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+-ncurses		progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h ../include/menu.h ../include/form.h
++ncurses		progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/panel.h $(incdir)/menu.h $(incdir)/form.h
+ newdemo		progs		$(srcdir)	$(HEADER_DEPS)
+ padview		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/widechars.h	$(srcdir)/popup_msg.h
+ pair_content	progs		$(srcdir)	$(HEADER_DEPS)
+Index: test/move_field.c
+--- /dev/null	2020-03-21 08:04:14.468000000 +0000
++++ ncurses-6.2-20200321/test/move_field.c	2020-03-21 22:04:03.000000000 +0000
+@@ -0,0 +1,515 @@
++/****************************************************************************
++ * Copyright 2020 Thomas E. Dickey                                          *
++ *                                                                          *
++ * 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: move_field.c,v 1.5 2020/03/21 22:04:03 tom Exp $
++ *
++ * Demonstrate move_field().
++ */
++
++#include 
++
++#if USE_LIBFORM
++
++#include 
++#include 
++
++#define DO_DEMO	CTRL('F')	/* actual key for toggling demo-mode */
++#define MY_DEMO	EDIT_FIELD('f')	/* internal request-code */
++
++static char empty[] = "";
++static FIELD *all_fields[100];
++
++/* *INDENT-OFF* */
++static struct {
++    int code;
++    int result;
++    const char *help;
++} commands[] = {
++    { CTRL('A'),     REQ_BEG_FIELD,   "go to beginning of field" },
++    { CTRL('D'),     REQ_DOWN_FIELD,  "move downward to field" },
++    { CTRL('E'),     REQ_END_FIELD,   "go to end of field" },
++    { CTRL('H'),     REQ_DEL_PREV,    "delete previous character" },
++    { CTRL('I'),     REQ_NEXT_FIELD,  "go to next field" },
++    { CTRL('K'),     REQ_CLR_EOF,     "clear to end of field" },
++    { CTRL('N'),     REQ_NEXT_FIELD,  "go to next field" },
++    { CTRL('P'),     REQ_PREV_FIELD,  "go to previous field" },
++    { CTRL('Q'),     MY_QUIT,         "exit form" },
++    { CTRL('U'),     REQ_UP_FIELD,    "move upward to field" },
++    { CTRL('W'),     REQ_NEXT_WORD,   "go to next word" },
++    { CTRL('X'),     REQ_CLR_FIELD,   "clear field" },
++    { CTRL('['),     MY_QUIT,         "exit form" },
++    { KEY_F(1),      MY_HELP,         "show this screen", },
++    { KEY_BACKSPACE, REQ_DEL_PREV,    "delete previous character" },
++    { KEY_BTAB,      REQ_PREV_FIELD,  "go to previous field" },
++    { KEY_DOWN,      REQ_DOWN_CHAR,   "move down 1 character" },
++    { KEY_END,       REQ_LAST_FIELD,  "go to last field" },
++    { KEY_HOME,      REQ_FIRST_FIELD, "go to first field" },
++    { KEY_LEFT,      REQ_LEFT_CHAR,   "move left 1 character" },
++    { KEY_NEXT,      REQ_NEXT_FIELD,  "go to next field" },
++    { KEY_PREVIOUS,  REQ_PREV_FIELD,  "go to previous field" },
++    { KEY_RIGHT,     REQ_RIGHT_CHAR,  "move right 1 character" },
++    { KEY_UP,        REQ_UP_CHAR,     "move up 1 character" },
++    { DO_DEMO,       MY_DEMO,         "move current field with cursor keys" }
++};
++/* *INDENT-ON* */
++
++static void
++my_help_edit_field(void)
++{
++    int used = 0;
++    unsigned n;
++    char **msgs = typeCalloc(char *, 3 + SIZEOF(commands));
++
++    msgs[used++] = strdup("Defined form edit/traversal keys:");
++    for (n = 0; n < SIZEOF(commands); ++n) {
++	char *msg;
++	const char *name;
++	const char *code = keyname(commands[n].code);
++	size_t need = 5;
++#ifdef NCURSES_VERSION
++	if ((name = form_request_name(commands[n].result)) == 0)
++#endif
++	    name = commands[n].help;
++	need = 5 + strlen(code) + strlen(name);
++	msg = typeMalloc(char, need);
++	_nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
++	msgs[used++] = msg;
++    }
++    msgs[used++] =
++	strdup("Arrow keys move within a field as you would expect.");
++    msgs[used] = 0;
++    popup_msg2(stdscr, msgs);
++    for (n = 0; msgs[n] != 0; ++n) {
++	free(msgs[n]);
++    }
++    free(msgs);
++}
++
++static FIELD *
++make_label(const char *label, int frow, int fcol)
++{
++    FIELD *f = new_field(1, (int) strlen(label), frow, fcol, 0, 0);
++
++    if (f) {
++	set_field_buffer(f, 0, label);
++	set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE));
++    }
++    return (f);
++}
++
++static FIELD *
++make_field(int frow, int fcol, int rows, int cols)
++{
++    FIELD *f = new_field(rows, cols, frow, fcol, 0, 1);
++
++    if (f) {
++	set_field_back(f, A_UNDERLINE);
++	init_edit_field(f, empty);
++    }
++    return (f);
++}
++
++static void
++erase_form(FORM *f)
++{
++    WINDOW *w = form_win(f);
++    WINDOW *s = form_sub(f);
++
++    unpost_form(f);
++    werase(w);
++    wrefresh(w);
++    delwin(s);
++    delwin(w);
++}
++
++static FieldAttrs *
++my_field_attrs(FIELD *f)
++{
++    return (FieldAttrs *) field_userptr(f);
++}
++
++static int
++buffer_length(FIELD *f)
++{
++    return my_field_attrs(f)->row_lengths[0];
++}
++
++static void
++set_buffer_length(FIELD *f, int length)
++{
++    my_field_attrs(f)->row_lengths[0] = length;
++}
++
++static int
++offset_in_field(FORM *form)
++{
++    FIELD *field = current_field(form);
++    int currow, curcol;
++
++    form_getyx(form, currow, curcol);
++    return curcol + currow * (int) field->dcols;
++}
++
++static void
++inactive_field(FIELD *f)
++{
++    set_field_back(f, my_field_attrs(f)->background);
++}
++
++static int
++my_edit_field(FORM *form, int *result)
++{
++    int ch = wgetch(form_win(form));
++    int status;
++    FIELD *before;
++    unsigned n;
++    int length;
++    int before_row;
++    int before_col;
++    int before_off = offset_in_field(form);
++
++    form_getyx(form, before_row, before_col);
++    before = current_field(form);
++    set_field_back(before, A_NORMAL);
++    if (ch <= KEY_MAX) {
++	set_field_back(before, A_REVERSE);
++    } else if (ch <= MAX_FORM_COMMAND) {
++	inactive_field(before);
++    }
++
++    *result = ch;
++    for (n = 0; n < SIZEOF(commands); ++n) {
++	if (commands[n].code == ch) {
++	    *result = commands[n].result;
++	    break;
++	}
++    }
++
++    status = form_driver(form, *result);
++
++    if (status == E_OK) {
++	bool modified = TRUE;
++
++	length = buffer_length(before);
++	if (length < before_off)
++	    length = before_off;
++	switch (*result) {
++	case REQ_CLR_EOF:
++	    length = before_off;
++	    break;
++	case REQ_CLR_EOL:
++	    if ((int) (before_row + 1) == (int) (before->rows))
++		length = before_off;
++	    break;
++	case REQ_CLR_FIELD:
++	    length = 0;
++	    break;
++	case REQ_DEL_CHAR:
++	    if (length > before_off)
++		--length;
++	    break;
++	case REQ_DEL_PREV:
++	    if (length > 0) {
++		if (before_col > 0) {
++		    --length;
++		} else if (before_row > 0) {
++		    length -= (int) before->cols + before_col;
++		}
++	    }
++	    break;
++	case REQ_NEW_LINE:
++	    length += (int) before->cols;
++	    break;
++
++	default:
++	    modified = (ch < MIN_FORM_COMMAND
++			&& isprint(ch));
++	    break;
++	}
++
++	/*
++	 * If we do not force a re-validation, then field_buffer 0 will
++	 * be lagging by one character.
++	 */
++	if (modified && form_driver(form, REQ_VALIDATION) == E_OK && *result
++	    < MIN_FORM_COMMAND)
++	    ++length;
++
++	set_buffer_length(before, length);
++    }
++
++    if (current_field(form) != before)
++	inactive_field(before);
++    return status;
++}
++
++static FIELD **
++copy_fields(FIELD **source, int length)
++{
++    FIELD **target = calloc(length + 1, sizeof(FIELD *));
++    memcpy(target, source, length * sizeof(FIELD *));
++    return target;
++}
++
++/* display a status message to show what's happening */
++static void
++show_status(FORM *form, FIELD *field)
++{
++    WINDOW *sub = form_sub(form);
++    int currow, curcol;
++
++    getyx(stdscr, currow, curcol);
++    mvprintw(LINES - 1, 0,
++	     "Field at [%d,%d].  Press %s to quit moving.",
++	     getbegy(sub) + field->frow,
++	     getbegx(sub) + field->fcol,
++	     keyname(DO_DEMO));
++    clrtobot();
++    move(currow, curcol);
++    refresh();
++}
++
++/*
++ * Move the current label+field in response to cursor-keys (or h,j,k,l) until
++ * a control/F is read.
++ */
++static void
++do_demo(FORM *form)
++{
++    int count = field_count(form);
++    FIELD *my_field = current_field(form);
++
++    if (count > 0 && my_field != NULL) {
++	FIELD **old_fields = copy_fields(form_fields(form), count);
++	FIELD **new_fields = copy_fields(form_fields(form), count);
++	int ch;
++
++	if (old_fields != NULL && new_fields != NULL) {
++	    bool found = FALSE;
++
++	    /* TODO: move the label too, in parallel with the editing field */
++
++	    /* remove the current field from the newer list */
++	    for (ch = 0; ch <= count; ++ch) {
++		if (found) {
++		    new_fields[ch - 1] = new_fields[ch];
++		} else if (new_fields[ch] == my_field) {
++		    found = TRUE;
++		}
++	    }
++
++	    if (found) {
++		int currow, curcol;
++
++		getyx(stdscr, currow, curcol);
++
++		show_status(form, my_field);
++		ch = '?';
++		while ((ch = wgetch(form_win(form))) != DO_DEMO) {
++		    int field_y = my_field->frow;
++		    int field_x = my_field->fcol;
++
++		    switch (ch) {
++		    case 'h':
++		    case KEY_LEFT:
++			if (field_x > 0)
++			    field_x--;
++			break;
++		    case 'j':
++		    case KEY_DOWN:
++			field_y++;
++			break;
++		    case 'k':
++		    case KEY_UP:
++			if (field_y > 0)
++			    field_y--;
++			break;
++		    case 'l':
++		    case KEY_RIGHT:
++			field_x++;
++			break;
++		    case CTRL('Q'):
++		    case CTRL('['):
++			ch = DO_DEMO;
++			/* FALLTHRU */
++		    case DO_DEMO:
++			break;
++		    default:
++			continue;
++		    }
++
++		    if (ch == DO_DEMO)
++			break;
++
++		    /* alter connected fields temporarily to move the field */
++		    unpost_form(form);
++		    set_form_fields(form, new_fields);
++		    post_form(form);
++
++		    /* TODO: update screen position on success */
++		    move_field(my_field, field_y, field_x);
++
++		    /* restore the form's list of fields */
++		    unpost_form(form);
++		    set_form_fields(form, old_fields);
++		    post_form(form);
++
++		    show_status(form, my_field);
++		}
++
++		/* cleanup */
++		move(LINES - 1, 0);
++		clrtobot();
++		move(currow, curcol);
++		refresh();
++	    }
++	}
++	free(new_fields);
++    }
++}
++
++static int
++my_form_driver(FORM *form, int c)
++{
++    switch (c) {
++    case MY_QUIT:
++	if (form_driver(form, REQ_VALIDATION) == E_OK)
++	    return (TRUE);
++	break;
++    case MY_HELP:
++	my_help_edit_field();
++	break;
++    case MY_DEMO:
++	do_demo(form);
++	break;
++    default:
++	beep();
++	break;
++    }
++    return (FALSE);
++}
++
++static void
++demo_forms(void)
++{
++    FORM *form;
++    int c;
++    unsigned n = 0;
++    const char *fname;
++
++    /* describe the form */
++    all_fields[n++] = make_label("Sample Form", 0, 15);
++
++    fname = "Last Name";
++    all_fields[n++] = make_label(fname, 2, 0);
++    all_fields[n++] = make_field(3, 0, 1, 18);
++    set_field_type(all_fields[n - 1], TYPE_ALPHA, 1);
++
++    fname = "First Name";
++    all_fields[n++] = make_label(fname, 2, 20);
++    all_fields[n++] = make_field(3, 20, 1, 12);
++    set_field_type(all_fields[n - 1], TYPE_ALPHA, 1);
++
++    fname = "Middle Name";
++    all_fields[n++] = make_label(fname, 2, 34);
++    all_fields[n++] = make_field(3, 34, 1, 12);
++    set_field_type(all_fields[n - 1], TYPE_ALPHA, 1);
++
++    fname = "Comments";
++    all_fields[n++] = make_label(fname, 5, 0);
++    all_fields[n++] = make_field(6, 0, 4, 46);
++    init_edit_field(all_fields[n - 1], empty);
++
++    all_fields[n] = (FIELD *) 0;
++
++    if ((form = new_form(all_fields)) != 0) {
++	int finished = 0;
++
++	post_form(form);
++
++	while (!finished) {
++	    switch (my_edit_field(form, &c)) {
++	    case E_OK:
++		break;
++	    case E_UNKNOWN_COMMAND:
++		finished = my_form_driver(form, c);
++		break;
++	    default:
++		beep();
++		break;
++	    }
++	}
++
++	erase_form(form);
++
++	free_form(form);
++    }
++    for (c = 0; all_fields[c] != 0; c++) {
++	free_edit_field(all_fields[c]);
++	free_field(all_fields[c]);
++    }
++    noraw();
++    nl();
++}
++
++int
++main(void)
++{
++    setlocale(LC_ALL, "");
++
++    initscr();
++    cbreak();
++    noecho();
++    raw();
++    nonl();			/* lets us read ^M's */
++    intrflush(stdscr, FALSE);
++    keypad(stdscr, TRUE);
++
++    if (has_colors()) {
++	start_color();
++	init_pair(1, COLOR_WHITE, COLOR_BLUE);
++	init_pair(2, COLOR_GREEN, COLOR_BLACK);
++	init_pair(3, COLOR_CYAN, COLOR_BLACK);
++	bkgd((chtype) COLOR_PAIR(1));
++	refresh();
++    }
++
++    demo_forms();
++
++    endwin();
++    ExitProgram(EXIT_SUCCESS);
++}
++
++#else
++int
++main(void)
++{
++    printf("This program requires the curses form library\n");
++    ExitProgram(EXIT_FAILURE);
++}
++#endif
+Index: test/programs
+Prereq:  1.45 
+--- ncurses-6.2-20200314+/test/programs	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200321/test/programs	2020-03-21 15:55:22.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: programs,v 1.45 2020/02/02 23:34:34 tom Exp $
++# $Id: programs,v 1.46 2020/03/21 15:55:22 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+ # Copyright 2006-2016,2017 Free Software Foundation, Inc.                    #
+@@ -55,6 +55,7 @@
+ dots_mvcur	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	dots_mvcur
+ dots_termcap	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	dots_termcap
+ dots_xcurses	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	dots_xcurses
++dup_field	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	dup_field edit_field popup_msg
+ echochar	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	echochar
+ extended_color	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	extended_color
+ filter		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	filter
+@@ -75,6 +76,7 @@
+ knight		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	knight
+ list_keys	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	list_keys
+ lrtest		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	lrtest
++move_field	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	move_field edit_field popup_msg
+ movewindow	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	movewindow popup_msg
+ ncurses		$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	ncurses
+ newdemo		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	newdemo
diff --git a/ncurses-6.2-20200328.patch b/ncurses-6.2-20200328.patch
new file mode 100644
index 0000000..ab39524
--- /dev/null
+++ b/ncurses-6.2-20200328.patch
@@ -0,0 +1,765 @@
+# ncurses 6.2 - patch 20200328 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.2 is at
+# 	ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.2 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.2
+#	http://invisible-mirror.net/archives/ncurses/6.2 
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200328.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Mar 29 01:03:54 UTC 2020
+# ------------------------------------------------------------------------------
+# Ada95/src/Makefile.in            |   10 +++++-----
+# NEWS                             |    7 ++++++-
+# VERSION                          |    2 +-
+# dist.mk                          |    4 ++--
+# form/fld_dup.c                   |   13 ++++++-------
+# man/curs_print.3x                |    4 ++--
+# man/form.3x                      |    4 ++--
+# man/form_field.3x                |    4 ++--
+# man/form_field_buffer.3x         |    4 ++--
+# man/form_field_new.3x            |    6 +++---
+# man/form_field_userptr.3x        |    4 ++--
+# man/form_fieldtype.3x            |    4 ++--
+# man/form_new.3x                  |    4 ++--
+# man/form_requestname.3x          |    6 +++---
+# man/form_userptr.3x              |    4 ++--
+# man/menu_items.3x                |    4 ++--
+# man/menu_mark.3x                 |    4 ++--
+# man/menu_new.3x                  |    4 ++--
+# man/menu_pattern.3x              |    4 ++--
+# man/menu_requestname.3x          |    6 +++---
+# man/menu_userptr.3x              |    4 ++--
+# man/mitem_current.3x             |    4 ++--
+# man/mitem_name.3x                |    4 ++--
+# man/mitem_new.3x                 |    4 ++--
+# man/mitem_userptr.3x             |    4 ++--
+# package/debian-mingw/changelog   |    4 ++--
+# package/debian-mingw64/changelog |    4 ++--
+# package/debian/changelog         |    4 ++--
+# package/mingw-ncurses.nsi        |    4 ++--
+# package/mingw-ncurses.spec       |    2 +-
+# package/ncurses.spec             |    2 +-
+# package/ncursest.spec            |    2 +-
+# test/move_field.c                |    9 +++++----
+# 33 files changed, 79 insertions(+), 74 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/src/Makefile.in
+Prereq:  1.89 
+--- ncurses-6.2-20200321+/Ada95/src/Makefile.in	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/Ada95/src/Makefile.in	2020-03-28 18:05:56.000000000 +0000
+@@ -29,7 +29,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.89 2020/02/02 23:34:34 tom Exp $
++#  $Id: Makefile.in,v 1.90 2020/03/28 18:05:56 Adam.Van.Ymeren Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -273,9 +273,9 @@
+ @USE_GNAT_PROJECTS@		$(STATIC_DIRS)
+ @USE_GNAT_PROJECTS@	@cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
+ @USE_GNAT_PROJECTS@	-rm -f $(GNAT_PROJECT)
+-@USE_GNAT_PROJECTS@	$(SHELL) $(srcdir)/library-cfg.sh static $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
++@USE_GNAT_PROJECTS@	$(SHELL) $(srcdir)/library-cfg.sh static library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
+ @USE_GNAT_PROJECTS@	@echo "Using GNAT Project:"
+-@USE_GNAT_PROJECTS@	@-$(SHELL) -c "diff -c $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0"
++@USE_GNAT_PROJECTS@	@-$(SHELL) -c "diff -c library.gpr $(GNAT_PROJECT); exit 0"
+ @USE_GNAT_PROJECTS@	$(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
+ @USE_GNAT_PROJECTS@	$(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS)
+ @USE_GNAT_PROJECTS@	-rm -f $(GNAT_PROJECT)
+@@ -311,9 +311,9 @@
+ @MAKE_ADA_SHAREDLIB@	cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
+ @MAKE_ADA_SHAREDLIB@	@cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
+ @MAKE_ADA_SHAREDLIB@	-rm -f $(GNAT_PROJECT)
+-@MAKE_ADA_SHAREDLIB@	$(SHELL) $(srcdir)/library-cfg.sh dynamic $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
++@MAKE_ADA_SHAREDLIB@	$(SHELL) $(srcdir)/library-cfg.sh dynamic library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
+ @MAKE_ADA_SHAREDLIB@	@echo "Making Ada shared-lib:"
+-@MAKE_ADA_SHAREDLIB@	@-$(SHELL) -c "diff -c $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0"
++@MAKE_ADA_SHAREDLIB@	@-$(SHELL) -c "diff -c library.gpr $(GNAT_PROJECT); exit 0"
+ @MAKE_ADA_SHAREDLIB@	$(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
+ @MAKE_ADA_SHAREDLIB@	-rm -f $(GNAT_PROJECT)
+ 
+Index: NEWS
+Prereq:  1.3466 
+--- ncurses-6.2-20200321+/NEWS	2020-03-22 00:28:35.000000000 +0000
++++ ncurses-6.2-20200328/NEWS	2020-03-28 23:33:04.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3466 2020/03/22 00:28:35 tom Exp $
++-- $Id: NEWS,v 1.3469 2020/03/28 23:33:04 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,11 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20200328
++	+ correct length of buffer copied in dup_field().
++	+ remove "$(srcdir)/" from path of library.gpr, needed for out-of-tree
++	  builds of Ada95 (patch by Adam Van Ymeren).
++
+ 20200321
+ 	+ improve configure-checks to reduce warnings about unused variables.
+ 	+ improve description of error-returns in waddch and waddnstr manual
+Index: VERSION
+--- ncurses-6.2-20200321+/VERSION	2020-03-21 12:15:18.000000000 +0000
++++ ncurses-6.2-20200328/VERSION	2020-03-28 10:37:50.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.2	20200321
++5:0:10	6.2	20200328
+Index: dist.mk
+Prereq:  1.1342 
+--- ncurses-6.2-20200321+/dist.mk	2020-03-21 12:15:18.000000000 +0000
++++ ncurses-6.2-20200328/dist.mk	2020-03-28 10:37:50.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1342 2020/03/21 12:15:18 tom Exp $
++# $Id: dist.mk,v 1.1343 2020/03/28 10:37:50 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 2
+-NCURSES_PATCH = 20200321
++NCURSES_PATCH = 20200328
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: form/fld_dup.c
+Prereq:  1.15 
+--- ncurses-6.2-20200321+/form/fld_dup.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/form/fld_dup.c	2020-03-29 00:39:41.000000000 +0000
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_dup.c,v 1.15 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: fld_dup.c,v 1.17 2020/03/29 00:39:41 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -61,8 +61,8 @@
+     {
+       T((T_CREATE("field %p"), (void *)New_Field));
+       *New_Field = *_nc_Default_Field;
+-      New_Field->frow = (short) frow;
+-      New_Field->fcol = (short) fcol;
++      New_Field->frow = (short)frow;
++      New_Field->fcol = (short)fcol;
+       New_Field->link = New_Field;
+       New_Field->rows = field->rows;
+       New_Field->cols = field->cols;
+@@ -80,13 +80,12 @@
+ 
+       if (_nc_Copy_Type(New_Field, field))
+ 	{
+-	  size_t i, len;
++	  size_t len;
+ 
+ 	  len = Total_Buffer_Size(New_Field);
+-	  if ((New_Field->buf = (FIELD_CELL *)malloc(len)))
++	  if ((New_Field->buf = (FIELD_CELL *)malloc(len * 20)))
+ 	    {
+-	      for (i = 0; i < len; ++i)
+-		New_Field->buf[i] = field->buf[i];
++	      memcpy(New_Field->buf, field->buf, len);
+ 	      returnField(New_Field);
+ 	    }
+ 	}
+Index: man/curs_print.3x
+Prereq:  1.14 
+--- ncurses-6.2-20200321+/man/curs_print.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/curs_print.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_print.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_print.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
+ .TH curs_print 3X ""
+ .SH NAME
+ \fBmcprint\fR \- ship binary data to printer
+@@ -51,7 +51,7 @@
+ .SH RETURN VALUE
+ The \fBmcprint\fR function returns \fBERR\fR if the write operation aborted
+ for some reason.
+-In this case, errno will contain either an error associated
++In this case, \fBerrno\fP will contain either an error associated
+ with \fBwrite\fP(2) or one of the following:
+ .TP 5
+ ENODEV
+Index: man/form.3x
+Prereq:  1.34 
+--- ncurses-6.2-20200321+/man/form.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/form.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form.3x,v 1.34 2020/02/02 23:34:34 tom Exp $
++.\" $Id: form.3x,v 1.35 2020/03/28 19:06:28 tom Exp $
+ .TH form 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -163,7 +163,7 @@
+ .TE
+ .SH RETURN VALUE
+ Routines that return pointers return \fBNULL\fR on error,
+-and set errno to the corresponding error-code returned by functions
++and set \fBerrno\fP to the corresponding error-code returned by functions
+ returning an integer.
+ Routines that return
+ an integer return one of the following error codes:
+Index: man/form_field.3x
+Prereq:  1.14 
+--- ncurses-6.2-20200321+/man/form_field.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/form_field.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
++.\" $Id: form_field.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
+ .TH form_field 3X ""
+ .SH NAME
+ \fBform_field\fR \- make and break connections between fields and forms
+@@ -55,7 +55,7 @@
+ to a specified location on the screen.
+ .SH RETURN VALUE
+ The function \fBform_fields\fR returns a pointer (which may be \fBNULL\fR).
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .PP
+ The function \fBfield_count\fR returns \fBERR\fR if the \fIform\fP parameter
+ is \fBNULL\fP.
+Index: man/form_field_buffer.3x
+Prereq:  1.25 
+--- ncurses-6.2-20200321+/man/form_field_buffer.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/form_field_buffer.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_buffer.3x,v 1.25 2020/02/02 23:34:34 tom Exp $
++.\" $Id: form_field_buffer.3x,v 1.26 2020/03/28 19:06:28 tom Exp $
+ .TH form_field_buffer 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -99,7 +99,7 @@
+ An argument of 0 turns off any maximum size threshold for that field.
+ .SH RETURN VALUE
+ The \fBfield_buffer\fR function returns NULL on error.
+-It sets errno according to their success:
++It sets \fBerrno\fP according to their success:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+Index: man/form_field_new.3x
+Prereq:  1.21 
+--- ncurses-6.2-20200321+/man/form_field_new.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/form_field_new.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_new.3x,v 1.21 2020/02/02 23:34:34 tom Exp $
++.\" $Id: form_field_new.3x,v 1.22 2020/03/28 19:06:28 tom Exp $
+ .TH form_field_new 3X ""
+ .SH NAME
+ \fBnew_field\fR,
+@@ -67,9 +67,9 @@
+ .PP
+ The function \fBfree_field\fR de-allocates storage associated with a field.
+ .SH RETURN VALUE
+-The function, \fBnew_field\fR, \fBdup_field\fR, \fBlink_field\fR return
++The functions \fBnew_field\fR, \fBdup_field\fR, \fBlink_field\fR return
+ \fBNULL\fR on error.
+-They set errno according to their success:
++They set \fBerrno\fP according to their success:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+Index: man/form_field_userptr.3x
+Prereq:  1.13 
+--- ncurses-6.2-20200321+/man/form_field_userptr.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/form_field_userptr.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_userptr.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
++.\" $Id: form_field_userptr.3x,v 1.14 2020/03/28 19:06:28 tom Exp $
+ .TH form_field_userptr 3X ""
+ .SH NAME
+ \fBset_field_userptr\fR,
+@@ -47,7 +47,7 @@
+ that field.
+ .SH RETURN VALUE
+ The function \fBfield_userptr\fR returns a pointer (which may be \fBNULL\fR).
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .PP
+ The function \fBset_field_userptr\fR returns \fBE_OK\fP (success).
+ .SH SEE ALSO
+Index: man/form_fieldtype.3x
+Prereq:  1.20 
+--- ncurses-6.2-20200321+/man/form_fieldtype.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/form_fieldtype.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_fieldtype.3x,v 1.20 2020/02/02 23:34:34 tom Exp $
++.\" $Id: form_fieldtype.3x,v 1.21 2020/03/28 19:06:28 tom Exp $
+ .TH form_fieldtype 3X ""
+ .SH NAME
+ \fBform_fieldtype\fR \- define validation-field types
+@@ -99,7 +99,7 @@
+ argument-block structure as arguments.
+ .SH RETURN VALUE
+ The pointer-valued routines return NULL on error.
+-They set errno according to their success:
++They set \fBerrno\fP according to their success:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+Index: man/form_new.3x
+Prereq:  1.12 
+--- ncurses-6.2-20200321+/man/form_new.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/form_new.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_new.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
++.\" $Id: form_new.3x,v 1.13 2020/03/28 19:06:28 tom Exp $
+ .TH form_new 3X ""
+ .SH NAME
+ \fBnew_form\fR,
+@@ -48,7 +48,7 @@
+ and frees the storage allocated for the form.
+ .SH RETURN VALUE
+ The function \fBnew_form\fR returns \fBNULL\fR on error.
+-It sets errno according to the function's success:
++It sets \fBerrno\fP according to the function's success:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+Index: man/form_requestname.3x
+Prereq:  1.12 
+--- ncurses-6.2-20200321+/man/form_requestname.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/form_requestname.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_requestname.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
++.\" $Id: form_requestname.3x,v 1.13 2020/03/28 19:06:28 tom Exp $
+ .TH form_requestname 3X ""
+ .SH NAME
+ \fBform_request_by_name\fP,
+@@ -48,11 +48,11 @@
+ with the given name and returns its request code.
+ Otherwise E_NO_MATCH is returned.
+ .SH RETURN VALUE
+-\fBform_request_name\fR returns \fBNULL\fR on error and sets errno
++\fBform_request_name\fR returns \fBNULL\fR on error and sets \fBerrno\fP
+ to \fBE_BAD_ARGUMENT\fR.
+ .br
+ \fBform_request_by_name\fR returns \fBE_NO_MATCH\fR on error.
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .SH SEE ALSO
+ \fBcurses\fR(3X), \fBform\fR(3X).
+ .SH NOTES
+Index: man/form_userptr.3x
+Prereq:  1.16 
+--- ncurses-6.2-20200321+/man/form_userptr.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/form_userptr.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_userptr.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
++.\" $Id: form_userptr.3x,v 1.17 2020/03/28 19:06:28 tom Exp $
+ .TH form_userptr 3X ""
+ .SH NAME
+ \fBset_form_userptr\fP,
+@@ -46,7 +46,7 @@
+ These functions get and set the form user pointer field.
+ .SH RETURN VALUE
+ The function \fBform_userptr\fR returns a pointer (which may be \fBNULL\fR).
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .PP
+ The function \fBset_form_userptr\fR returns \fBE_OK\fP (success).
+ .SH SEE ALSO
+Index: man/menu_items.3x
+Prereq:  1.14 
+--- ncurses-6.2-20200321+/man/menu_items.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/menu_items.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_items.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
++.\" $Id: menu_items.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
+ .TH menu_items 3X ""
+ .SH NAME
+ \fBset_menu_items\fR,
+@@ -52,7 +52,7 @@
+ The function \fBitem_count\fR returns the count of items in \fImenu\fR.
+ .SH RETURN VALUE
+ The function \fBmenu_items\fR returns a pointer (which may be \fBNULL\fR).
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .PP
+ The function \fBitem_count\fR returns \fBERR\fR (the general \fBcurses\fR error
+ return value) if its \fImenu\fP parameter is \fBNULL\fP.
+Index: man/menu_mark.3x
+Prereq:  1.15 
+--- ncurses-6.2-20200321+/man/menu_mark.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/menu_mark.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_mark.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
++.\" $Id: menu_mark.3x,v 1.16 2020/03/28 19:06:28 tom Exp $
+ .TH menu_mark 3X ""
+ .SH NAME
+ \fBset_menu_mark\fP,
+@@ -58,7 +58,7 @@
+ there is none).
+ .SH RETURN VALUE
+ The function \fBmenu_mark\fR returns a pointer (which may be \fBNULL\fR).
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .PP
+ The function \fBset_menu_mark\fR may return the following error codes:
+ .TP 5
+Index: man/menu_new.3x
+Prereq:  1.15 
+--- ncurses-6.2-20200321+/man/menu_new.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/menu_new.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_new.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
++.\" $Id: menu_new.3x,v 1.16 2020/03/28 19:06:28 tom Exp $
+ .TH menu_new 3X ""
+ .SH NAME
+ \fBnew_menu\fP,
+@@ -48,7 +48,7 @@
+ and frees the storage allocated for the menu.
+ .SH RETURN VALUE
+ The function \fBnew_menu\fR returns \fBNULL\fR on error.
+-It sets errno according to the function's failure:
++It sets \fBerrno\fP according to the function's failure:
+ .TP 5
+ .B E_NOT_CONNECTED
+ No items are connected to the menu.
+Index: man/menu_pattern.3x
+Prereq:  1.18 
+--- ncurses-6.2-20200321+/man/menu_pattern.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/menu_pattern.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_pattern.3x,v 1.18 2020/02/02 23:34:34 tom Exp $
++.\" $Id: menu_pattern.3x,v 1.19 2020/03/28 19:06:28 tom Exp $
+ .TH menu_pattern 3X ""
+ .SH NAME
+ \fBset_menu_pattern\fP,
+@@ -57,7 +57,7 @@
+ which is \fBNULL\fR if the \fImenu\fP parameter is \fBNULL\fP.
+ Otherwise, it is a pointer to a string which is empty
+ if no pattern has been set.
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .PP
+ The function \fBset_menu_pattern\fR may return the following error codes:
+ .TP 5
+Index: man/menu_requestname.3x
+Prereq:  1.12 
+--- ncurses-6.2-20200321+/man/menu_requestname.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/menu_requestname.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_requestname.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
++.\" $Id: menu_requestname.3x,v 1.13 2020/03/28 19:06:28 tom Exp $
+ .TH menu_requestname 3X ""
+ .SH NAME
+ \fBmenu_request_by_name\fP,
+@@ -49,10 +49,10 @@
+ Otherwise E_NO_MATCH is returned.
+ .SH RETURN VALUE
+ \fBmenu_request_name\fR returns \fBNULL\fR on error
+-and sets errno to \fBE_BAD_ARGUMENT\fR.
++and sets \fBerrno\fP to \fBE_BAD_ARGUMENT\fR.
+ .br
+ \fBmenu_request_by_name\fR returns \fBE_NO_MATCH\fR on error.
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .SH SEE ALSO
+ \fBcurses\fR(3X), \fBmenu\fR(3X).
+ .SH NOTES
+Index: man/menu_userptr.3x
+Prereq:  1.13 
+--- ncurses-6.2-20200321+/man/menu_userptr.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/menu_userptr.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_userptr.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
++.\" $Id: menu_userptr.3x,v 1.14 2020/03/28 19:06:28 tom Exp $
+ .TH menu_userptr 3X ""
+ .SH NAME
+ \fBset_menu_userptr\fP,
+@@ -46,7 +46,7 @@
+ These functions get and set the menu user pointer field.
+ .SH RETURN VALUE
+ \fBmenu_userptr\fR returns a pointer (which may be \fBNULL\fR).
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .PP
+ \fBset_menu_userptr\fP returns \fBE_OK\fP (success).
+ .SH SEE ALSO
+Index: man/mitem_current.3x
+Prereq:  1.17 
+--- ncurses-6.2-20200321+/man/mitem_current.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/mitem_current.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_current.3x,v 1.17 2020/02/02 23:34:34 tom Exp $
++.\" $Id: mitem_current.3x,v 1.18 2020/03/28 19:06:28 tom Exp $
+ .TH mitem_current 3X ""
+ .SH NAME
+ \fBmitem_current\fR \- set and get current_menu_item
+@@ -63,7 +63,7 @@
+ the menu's item pointer list.
+ .SH RETURN VALUE
+ \fBcurrent_item\fR returns a pointer (which may be \fBNULL\fR).
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .PP
+ \fBtop_row\fR and \fBitem_index\fR return \fBERR\fR (the general \fBcurses\fR
+ error value) if their \fImenu\fP parameter is \fBNULL\fP.
+Index: man/mitem_name.3x
+Prereq:  1.11 
+--- ncurses-6.2-20200321+/man/mitem_name.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/mitem_name.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_name.3x,v 1.11 2020/02/02 23:34:34 tom Exp $
++.\" $Id: mitem_name.3x,v 1.12 2020/03/28 19:06:28 tom Exp $
+ .TH mitem_name 3X ""
+ .SH NAME
+ \fBitem_name\fR,
+@@ -47,7 +47,7 @@
+ item.
+ .SH RETURN VALUE
+ These routines return a pointer (which may be \fBNULL\fR).
+-They do not set errno.
++They do not set \fBerrno\fP.
+ .SH SEE ALSO
+ \fBcurses\fR(3X), \fBmenu\fR(3X).
+ .SH NOTES
+Index: man/mitem_new.3x
+Prereq:  1.16 
+--- ncurses-6.2-20200321+/man/mitem_new.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/mitem_new.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_new.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
++.\" $Id: mitem_new.3x,v 1.17 2020/03/28 19:06:28 tom Exp $
+ .TH mitem_new 3X ""
+ .SH NAME
+ \fBnew_item\fP,
+@@ -56,7 +56,7 @@
+ name or the description of the item.
+ .SH RETURN VALUE
+ The function \fBnew_item\fR returns \fBNULL\fR on error.
+-It sets errno according to the function's failure:
++It sets \fBerrno\fP according to the function's failure:
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+Index: man/mitem_userptr.3x
+Prereq:  1.14 
+--- ncurses-6.2-20200321+/man/mitem_userptr.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.2-20200328/man/mitem_userptr.3x	2020-03-28 19:06:28.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_userptr.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
++.\" $Id: mitem_userptr.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
+ .TH mitem_userptr 3X ""
+ .SH NAME
+ \fBset_item_userptr\fP,
+@@ -47,7 +47,7 @@
+ that field.
+ .SH RETURN VALUE
+ The function \fBitem_userptr\fR returns a pointer (possibly \fBNULL\fR).
+-It does not set errno.
++It does not set \fBerrno\fP.
+ .PP
+ The \fBset_item_userptr\fP always returns \fBE_OK\fP (success).
+ .
+Index: package/debian-mingw/changelog
+--- ncurses-6.2-20200321+/package/debian-mingw/changelog	2020-03-21 12:15:18.000000000 +0000
++++ ncurses-6.2-20200328/package/debian-mingw/changelog	2020-03-28 10:37:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200321) unstable; urgency=low
++ncurses6 (6.2+20200328) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 21 Mar 2020 08:15:18 -0400
++ -- Thomas E. Dickey   Sat, 28 Mar 2020 06:37:50 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.2-20200321+/package/debian-mingw64/changelog	2020-03-21 12:15:18.000000000 +0000
++++ ncurses-6.2-20200328/package/debian-mingw64/changelog	2020-03-28 10:37:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200321) unstable; urgency=low
++ncurses6 (6.2+20200328) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 21 Mar 2020 08:15:18 -0400
++ -- Thomas E. Dickey   Sat, 28 Mar 2020 06:37:50 -0400
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.2-20200321+/package/debian/changelog	2020-03-21 12:15:18.000000000 +0000
++++ ncurses-6.2-20200328/package/debian/changelog	2020-03-28 10:37:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.2+20200321) unstable; urgency=low
++ncurses6 (6.2+20200328) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 21 Mar 2020 08:15:18 -0400
++ -- Thomas E. Dickey   Sat, 28 Mar 2020 06:37:50 -0400
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.386 
+--- ncurses-6.2-20200321+/package/mingw-ncurses.nsi	2020-03-21 12:15:18.000000000 +0000
++++ ncurses-6.2-20200328/package/mingw-ncurses.nsi	2020-03-28 10:37:50.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.386 2020/03/21 12:15:18 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.387 2020/03/28 10:37:50 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "2"
+ !define VERSION_YYYY  "2020"
+-!define VERSION_MMDD  "0321"
++!define VERSION_MMDD  "0328"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.2-20200321+/package/mingw-ncurses.spec	2020-03-21 12:15:18.000000000 +0000
++++ ncurses-6.2-20200328/package/mingw-ncurses.spec	2020-03-28 10:37:50.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.2
+-Release: 20200321
++Release: 20200328
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.2-20200321+/package/ncurses.spec	2020-03-21 12:15:18.000000000 +0000
++++ ncurses-6.2-20200328/package/ncurses.spec	2020-03-28 10:37:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.2
+-Release: 20200321
++Release: 20200328
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.2-20200321+/package/ncursest.spec	2020-03-21 12:15:18.000000000 +0000
++++ ncurses-6.2-20200328/package/ncursest.spec	2020-03-28 10:37:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.2
+-Release: 20200321
++Release: 20200328
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/move_field.c
+Prereq:  1.5 
+--- ncurses-6.2-20200321+/test/move_field.c	2020-03-21 22:04:03.000000000 +0000
++++ ncurses-6.2-20200328/test/move_field.c	2020-03-28 17:43:03.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: move_field.c,v 1.5 2020/03/21 22:04:03 tom Exp $
++ * $Id: move_field.c,v 1.6 2020/03/28 17:43:03 tom Exp $
+  *
+  * Demonstrate move_field().
+  */
+@@ -269,7 +269,7 @@
+ }
+ 
+ static FIELD **
+-copy_fields(FIELD **source, int length)
++copy_fields(FIELD **source, size_t length)
+ {
+     FIELD **target = calloc(length + 1, sizeof(FIELD *));
+     memcpy(target, source, length * sizeof(FIELD *));
+@@ -305,8 +305,9 @@
+     FIELD *my_field = current_field(form);
+ 
+     if (count > 0 && my_field != NULL) {
+-	FIELD **old_fields = copy_fields(form_fields(form), count);
+-	FIELD **new_fields = copy_fields(form_fields(form), count);
++	size_t needed = (size_t) count;
++	FIELD **old_fields = copy_fields(form_fields(form), needed);
++	FIELD **new_fields = copy_fields(form_fields(form), needed);
+ 	int ch;
+ 
+ 	if (old_fields != NULL && new_fields != NULL) {
diff --git a/ncurses.spec b/ncurses.spec
index cfd07be..b33fa7e 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -3,8 +3,8 @@
 %define        patchver %(echo %version | cut -d. -f 3)
 %define        tack_ver 1.07
 Name:          ncurses
-Version:       6.1.20200118
-Release:       2mamba
+Version:       6.2.20200328
+Release:       1mamba
 Summary:       A CRT screen handling and optimization package
 Group:         System/Libraries
 Vendor:        openmamba
@@ -13,40 +13,40 @@ Packager:      Silvan Calarco 
 URL:           http://www.gnu.org/directory/GNU/ncurses.html
 Source0:       http://ftp.gnu.org/pub/gnu/ncurses/ncurses-%{majver}.tar.gz
 %if "%{?patchver}" != ""
-Source1:       ftp://dickey.his.com/ncurses/%{majver}/patch-%{majver}-20190609.sh.gz
-Source2:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190615.patch.gz
-Source3:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190623.patch.gz
-Source4:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190630.patch.gz
-Source5:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190706.patch.gz
-Source6:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190713.patch.gz
-Source7:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190720.patch.gz
-Source8:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190727.patch.gz
-Source9:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190728.patch.gz
-Source10:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190803.patch.gz
-Source11:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190810.patch.gz
-Source12:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190817.patch.gz
-Source13:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190824.patch.gz
-Source14:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190831.patch.gz
-Source15:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190907.patch.gz
-Source16:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190914.patch.gz
-Source17:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190921.patch.gz
-Source18:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190928.patch.gz
-Source19:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191005.patch.gz
-Source20:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191012.patch.gz
-Source21:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191015.patch.gz
-Source22:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191019.patch.gz
-Source23:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191026.patch.gz
-Source24:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191102.patch.gz
-Source25:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191109.patch.gz
-Source26:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191116.patch.gz
-Source27:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191123.patch.gz
-Source28:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191130.patch.gz
-Source29:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191207.patch.gz
-Source30:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191214.patch.gz
-Source31:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191221.patch.gz
-Source32:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191228.patch.gz
-Source33:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200104.patch.gz
-Source34:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200111.patch.gz
+Source1:	   ftp://dickey.his.com/ncurses/patches/patch-%{majver}-20200212.sh.gz
+Source2:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200215.patch.gz
+Source3:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200222.patch.gz
+Source4:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200229.patch.gz
+Source5:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200301.patch.gz
+Source6:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200308.patch.gz
+Source7:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200314.patch.gz
+Source8:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200321.patch.gz
+Source9:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200328.patch.gz
+#Source10:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190803.patch.gz
+#Source11:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190810.patch.gz
+#Source12:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190817.patch.gz
+#Source13:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190824.patch.gz
+#Source14:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190831.patch.gz
+#Source15:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190907.patch.gz
+#Source16:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190914.patch.gz
+#Source17:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190921.patch.gz
+#Source18:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190928.patch.gz
+#Source19:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191005.patch.gz
+#Source20:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191012.patch.gz
+#Source21:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191015.patch.gz
+#Source22:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191019.patch.gz
+#Source23:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191026.patch.gz
+#Source24:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191102.patch.gz
+#Source25:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191109.patch.gz
+#Source26:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191116.patch.gz
+#Source27:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191123.patch.gz
+#Source28:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191130.patch.gz
+#Source29:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191207.patch.gz
+#Source30:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191214.patch.gz
+#Source31:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191221.patch.gz
+#Source32:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191228.patch.gz
+#Source33:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200104.patch.gz
+#Source34:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200111.patch.gz
 Source99:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-%{patchver}.patch.gz
 %endif
 License:       MIT
@@ -103,7 +103,7 @@ The header files and libraries for developing applications that use the ncurses
 #:<< _EOF
 
 %if "%{?patchver}" != ""
-gunzip -c %{SOURCE1} | bash
+#gunzip -c %{SOURCE1} | bash
 
 gunzip -c %{SOURCE2} | patch -p1
 gunzip -c %{SOURCE3} | patch -p1
@@ -112,32 +112,32 @@ gunzip -c %{SOURCE5} | patch -p1
 gunzip -c %{SOURCE6} | patch -p1
 gunzip -c %{SOURCE7} | patch -p1
 gunzip -c %{SOURCE8} | patch -p1
-gunzip -c %{SOURCE9} | patch -p1
-gunzip -c %{SOURCE10} | patch -p1
-gunzip -c %{SOURCE11} | patch -p1
-gunzip -c %{SOURCE12} | patch -p1
-gunzip -c %{SOURCE13} | patch -p1
-gunzip -c %{SOURCE14} | patch -p1
-gunzip -c %{SOURCE15} | patch -p1
-gunzip -c %{SOURCE16} | patch -p1
-gunzip -c %{SOURCE17} | patch -p1
-gunzip -c %{SOURCE18} | patch -p1
-gunzip -c %{SOURCE19} | patch -p1
-gunzip -c %{SOURCE20} | patch -p1
-gunzip -c %{SOURCE21} | patch -p1
-gunzip -c %{SOURCE22} | patch -p1
-gunzip -c %{SOURCE23} | patch -p1
-gunzip -c %{SOURCE24} | patch -p1
-gunzip -c %{SOURCE25} | patch -p1
-gunzip -c %{SOURCE26} | patch -p1
-gunzip -c %{SOURCE27} | patch -p1
-gunzip -c %{SOURCE28} | patch -p1
-gunzip -c %{SOURCE29} | patch -p1
-gunzip -c %{SOURCE30} | patch -p1
-gunzip -c %{SOURCE31} | patch -p1
-gunzip -c %{SOURCE32} | patch -p1
-gunzip -c %{SOURCE33} | patch -p1
-gunzip -c %{SOURCE34} | patch -p1
+#gunzip -c %{SOURCE9} | patch -p1
+#gunzip -c %{SOURCE10} | patch -p1
+#gunzip -c %{SOURCE11} | patch -p1
+#gunzip -c %{SOURCE12} | patch -p1
+#gunzip -c %{SOURCE13} | patch -p1
+#gunzip -c %{SOURCE14} | patch -p1
+#gunzip -c %{SOURCE15} | patch -p1
+#gunzip -c %{SOURCE16} | patch -p1
+#gunzip -c %{SOURCE17} | patch -p1
+#gunzip -c %{SOURCE18} | patch -p1
+#gunzip -c %{SOURCE19} | patch -p1
+#gunzip -c %{SOURCE20} | patch -p1
+#gunzip -c %{SOURCE21} | patch -p1
+#gunzip -c %{SOURCE22} | patch -p1
+#gunzip -c %{SOURCE23} | patch -p1
+#gunzip -c %{SOURCE24} | patch -p1
+#gunzip -c %{SOURCE25} | patch -p1
+#gunzip -c %{SOURCE26} | patch -p1
+#gunzip -c %{SOURCE27} | patch -p1
+#gunzip -c %{SOURCE28} | patch -p1
+#gunzip -c %{SOURCE29} | patch -p1
+#gunzip -c %{SOURCE30} | patch -p1
+#gunzip -c %{SOURCE31} | patch -p1
+#gunzip -c %{SOURCE32} | patch -p1
+#gunzip -c %{SOURCE33} | patch -p1
+#gunzip -c %{SOURCE34} | patch -p1
 gunzip -c %{SOURCE99} | patch -p1
 %endif
 
@@ -326,6 +326,9 @@ fi
 %{_datadir}/terminfo/*
 
 %changelog
+* Tue Mar 31 2020 Ercole 'ercolinux' Carpanetto  6.2.20200328-1mamba
+- update to 6.2.20200328
+
 * Mon Feb 10 2020 Silvan Calarco  6.1.20200118-2mamba
 - postrans workaround to fix libtinfo.so.6 disappearing on upgrade
 
diff --git a/patch-6.1-20190609.sh.gz b/patch-6.1-20190609.sh.gz
deleted file mode 100644
index f63f175..0000000
Binary files a/patch-6.1-20190609.sh.gz and /dev/null differ
diff --git a/patch-6.2-20200212.sh.gz b/patch-6.2-20200212.sh.gz
new file mode 100644
index 0000000..fcbb5ce
Binary files /dev/null and b/patch-6.2-20200212.sh.gz differ